Skip to content

C
cloud-fb
Commit b6e93e38 by 王衍超
Options

解决冲突;

parents b91554bc 1ceacd34
Showing with 173 additions and 50 deletions
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java
......@@ -76,7 +76,6 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
for (KObject kObject : list) {
KObject kObject1 = detailBean.newInstance();
kObject1.set("dinasType",kObject);
kObject.set("stations",template.findByExample(STATION_DINAS_TYPE_DETAIL_ENTITY,kObject1));
}
page.setDatas(list);
return page;
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/DinasTypeController.java
......@@ -32,7 +32,8 @@ public class DinasTypeController {
Page<KObject> objectPage = new Page<>();
objectPage.setPageNo(pageNo);
objectPage.setPageSize(pageSize);
return ResponseObj.success("操作成功",dinasTypeService.queryByPaging(objectPage));
Page<KObject> kObjectPage = dinasTypeService.queryByPaging(objectPage);
return ResponseObj.success("操作成功",kObjectPage);
}
/**
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/SandAttachmentController.java
......@@ -42,6 +42,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
import com.beecode.bap.attachment.AttachmentConstants.FileCheck;
......@@ -50,8 +52,9 @@ import com.beecode.bap.attachment.common.Utils;
import com.beecode.bap.attachment.exception.AttachmentDataDownLoadException;
import com.beecode.bap.attachment.exception.AttachmentDataUploadException;
import com.beecode.bap.attachment.exception.AttachmentException;
import com.beecode.bap.attachment.internal.CreatorAdapterService;
import com.beecode.bap.attachment.service.AttachmentService;
import com.beecode.inz.basis.pojo.SandUser;
import com.beecode.inz.basis.service.SandUserService;
import com.jiuqi.np.tenant.spring.TenantRuntime;
@RestController
......@@ -72,6 +75,9 @@ public class SandAttachmentController {
@Autowired
private AttachmentService attachmentService;
@Autowired
private SandUserService sandUserService;
@RequestMapping(value = "files", method = RequestMethod.POST)
@Transactional
......@@ -148,7 +154,7 @@ public class SandAttachmentController {
}
attachmentInfo.setFileType(Utils.getFileType(file.getOriginalFilename()));
attachmentInfo.setSize(file.getSize());
UUID currentCreatorId = getCurrentCreatorId();
UUID currentCreatorId = getCurrentSandUserId();
if (currentCreatorId != null) {
attachmentInfo.setCreatorId(currentCreatorId);
}
......@@ -483,15 +489,22 @@ public class SandAttachmentController {
return false;
}
@Autowired
private CreatorAdapterService creatorAdapterService;
// @Autowired
// private CreatorAdapterService creatorAdapterService;
private UUID getCurrentCreatorId() {
return creatorAdapterService.getCurrentCreatorId();
// private UUID getCurrentCreatorId() {
// return creatorAdapterService.getCurrentCreatorId();
// }
private UUID getCurrentSandUserId() {
ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
return (UUID)attr.getRequest().getSession().getAttribute("userId");
}
private String getCreatorName(UUID id) {
return creatorAdapterService.getCreatorName(id);
// return creatorAdapterService.getCreatorName(id);
SandUser user = sandUserService.getById(id);
return user.getTitle();
}
private Map<String, Object> toMap(AttachmentInfo info) {
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/WarehouseAttachmentController.java
......@@ -42,6 +42,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
import com.beecode.bap.attachment.AttachmentConstants.FileCheck;
......@@ -50,8 +52,9 @@ import com.beecode.bap.attachment.common.Utils;
import com.beecode.bap.attachment.exception.AttachmentDataDownLoadException;
import com.beecode.bap.attachment.exception.AttachmentDataUploadException;
import com.beecode.bap.attachment.exception.AttachmentException;
import com.beecode.bap.attachment.internal.CreatorAdapterService;
import com.beecode.bap.attachment.service.AttachmentService;
import com.beecode.inz.basis.pojo.WarehouseUser;
import com.beecode.inz.basis.service.WarehouseUserService;
import com.jiuqi.np.tenant.spring.TenantRuntime;
@RestController
......@@ -72,6 +75,9 @@ public class WarehouseAttachmentController {
@Autowired
private AttachmentService attachmentService;
@Autowired
private WarehouseUserService warehouseUserService;
@RequestMapping(value = "files", method = RequestMethod.POST)
@Transactional
......@@ -148,7 +154,7 @@ public class WarehouseAttachmentController {
}
attachmentInfo.setFileType(Utils.getFileType(file.getOriginalFilename()));
attachmentInfo.setSize(file.getSize());
UUID currentCreatorId = getCurrentCreatorId();
UUID currentCreatorId = getCurrentWarehouseUserId();
if (currentCreatorId != null) {
attachmentInfo.setCreatorId(currentCreatorId);
}
......@@ -483,15 +489,22 @@ public class WarehouseAttachmentController {
return false;
}
@Autowired
private CreatorAdapterService creatorAdapterService;
// @Autowired
// private CreatorAdapterService creatorAdapterService;
private UUID getCurrentCreatorId() {
return creatorAdapterService.getCurrentCreatorId();
// private UUID getCurrentCreatorId() {
// return creatorAdapterService.getCurrentCreatorId();
// }
private UUID getCurrentWarehouseUserId() {
ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
return (UUID)attr.getRequest().getSession().getAttribute("userId");
}
private String getCreatorName(UUID id) {
return creatorAdapterService.getCreatorName(id);
// return creatorAdapterService.getCreatorName(id);
WarehouseUser user = warehouseUserService.getById(id);
return user.getTitle();
}
private Map<String, Object> toMap(AttachmentInfo info) {
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Station$DinasTypeDetail.jmx
......@@ -26,6 +26,9 @@
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.json.JsonIgnore</m:type>
</m:annotation>
</m:annotations>
<m:id>61699557-6afc-43c2-adeb-fecfeb844536</m:id>
<m:name>dinasType</m:name>
......
backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/dao/PurchaseSandCompanyDao.java
......@@ -9,6 +9,6 @@ public interface PurchaseSandCompanyDao {
KObject load(UUID id);
List<KObject> queryPurchaseSandCompanyByName(String name);
List<KObject> queryPurchaseSandCompanyByName(String name, UUID currentRegionalCompany);
}
backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/internal/dao/PurchaseSandCompanyDaoImpl.java
......@@ -11,6 +11,7 @@ import org.springframework.orm.hibernate5.HibernateCallback;
import org.springframework.orm.hibernate5.HibernateOperations;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.biz.service.DinasOrganizationService;
import com.xyst.dinas.project.constant.PurchaseSandCompanyConstant;
import com.xyst.dinas.project.dao.PurchaseSandCompanyDao;
......@@ -19,14 +20,17 @@ public class PurchaseSandCompanyDaoImpl implements PurchaseSandCompanyDao, Purch
@Autowired
private HibernateOperations template;
@Override
public List<KObject> queryPurchaseSandCompanyByName(String name) {
public List<KObject> queryPurchaseSandCompanyByName(String name, UUID currentRegionalCompany) {
return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
@SuppressWarnings("unchecked")
@Override
public List<KObject> doInHibernate(Session session) throws HibernateException {
Query<KObject> query = session.createQuery("from " + PURCHASE_SAND_COMPANY_NTITY + " where (discard is null or discard = 0) and name =:name", KObject.class);
Query<KObject> query = session.createQuery("from " + PURCHASE_SAND_COMPANY_NTITY + " where (discard is null or discard = 0) and name =:name and regionalCompany.id=:regionalCompany ", KObject.class);
query.setParameter("name", name);
query.setParameter("regionalCompany", currentRegionalCompany);
return query.getResultList();
}
});
......
backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/internal/service/PurchaseSandCompanyServiceImpl.java
package com.xyst.dinas.project.internal.service;
import java.util.List;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.biz.service.DinasOrganizationService;
import com.xyst.dinas.project.dao.ProjectFiledDao;
import com.xyst.dinas.project.dao.PurchaseSandCompanyDao;
import com.xyst.dinas.project.service.PurchaseSandCompanyService;
......@@ -14,9 +16,13 @@ public class PurchaseSandCompanyServiceImpl implements PurchaseSandCompanyServic
@Autowired
private PurchaseSandCompanyDao purchaseSandCompanyDao;
@Autowired
private DinasOrganizationService dinasOrganizationService;
@Override
public Boolean verifyName(String name) {
List<KObject> list = purchaseSandCompanyDao.queryPurchaseSandCompanyByName(name);
UUID currentRegionalCompany = dinasOrganizationService.getCurrentRegionalCompanyId();
List<KObject> list = purchaseSandCompanyDao.queryPurchaseSandCompanyByName(name, currentRegionalCompany);
Boolean flag = false;
if (list != null && list.size() > 0 ) {
flag = true;
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java
......@@ -5,12 +5,14 @@ import java.util.List;
import java.util.UUID;
import org.hibernate.query.Query;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable;
import org.springframework.orm.hibernate5.HibernateTemplate;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.constant.SalesPlanConstant;
import com.xyst.dinas.sales.web.request.SaleaPlanDetailQuery;
public class SalesPlanDao {
......@@ -94,14 +96,17 @@ public class SalesPlanDao {
update(kobject);
}
public List<KObject> querySalesPlanDetailsByMasterId(UUID salesPlanId) {
public List<KObject> querySalesPlanDetailsByMasterId(SaleaPlanDetailQuery saleaPlanDetailQuery) {
UUID salesPlanId = saleaPlanDetailQuery.getSalesPlanId();
String purchaseSandUnitName = saleaPlanDetailQuery.getPurchaseSandUnitName();
return template.execute(session ->{
String hql = "from " + SalesPlanConstant.ENTITY_DETAIL + " where master.id =:salesPlanId GROUP BY purchaseSandUnit.id, project.id, contract.id, id ";
Query<KObject> query = session.createQuery(hql, KObject.class);
StringBuilder hql = new StringBuilder(" from " + SalesPlanConstant.ENTITY_DETAIL + " where master.id =:salesPlanId ");
if (purchaseSandUnitName!=null) hql.append(" and purchaseSandUnit.name =:purchaseSandUnitName ");
hql.append(" GROUP BY purchaseSandUnit.id, project.id, contract.id, id ");
Query<KObject> query = session.createQuery(hql.toString(), KObject.class);
query.setParameter("salesPlanId", salesPlanId);
List<KObject> resultList = query.getResultList();
return resultList;
if (purchaseSandUnitName!=null) query.setParameter("purchaseSandUnitName", purchaseSandUnitName);
return query.getResultList();
});
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java
......@@ -25,6 +25,7 @@ import com.xyst.dinas.sales.dao.SalesPlanDao;
import com.xyst.dinas.sales.entity.SalesPlanDetail;
import com.xyst.dinas.sales.service.NeedPlanService;
import com.xyst.dinas.sales.service.SalesPlanService;
import com.xyst.dinas.sales.web.request.SaleaPlanDetailQuery;
/**
* 销售计划
*
......@@ -121,10 +122,10 @@ public class SalesPlanServiceImpl implements SalesPlanService{
}
public List<SalesPlanDetail> querySalesPlanDetails(UUID salesPlanId) {
public List<SalesPlanDetail> querySalesPlanDetails(SaleaPlanDetailQuery saleaPlanDetailQuery) {
ArrayList<SalesPlanDetail> salesPlanDetails = new ArrayList<>();
// KObject kObject = salesPlanDao.load(salesPlanId);
List<KObject> details = salesPlanDao.querySalesPlanDetailsByMasterId(salesPlanId);
List<KObject> details = salesPlanDao.querySalesPlanDetailsByMasterId(saleaPlanDetailQuery);
for (KObject detail : details) {
SalesPlanDetail salesPlanDetail = new SalesPlanDetail();
KObject contract = detail.get(SalesPlanConstant.contract);
......@@ -157,13 +158,14 @@ public class SalesPlanServiceImpl implements SalesPlanService{
return salesPlanDetails;
}
@Override
public KObject querySalesPlanDetailsByMasterId(UUID salesPlanId) {
KObject kObject = salesPlanDao.load(salesPlanId);
List<KObject> details = salesPlanDao.querySalesPlanDetailsByMasterId(salesPlanId);
kObject.set("SalesPlanDetails", details);
return kObject;
}
// @Override
// public Object querySalesPlanDetailsByMasterId(JSONObject jsonObject) {
// UUID salesPlanId = UUID.fromString(jsonObject.getString("salesPlanId"));
// KObject kObject = salesPlanDao.load(salesPlanId);
// List<KObject> details = salesPlanDao.querySalesPlanDetailsByMasterId(jsonObject);
// kObject.set("SalesPlanDetails", details);
// return kObject;
// }
@Override
public KObject querySalesPlanDetailsByMasterIdWarehouse(UUID salesPlanId, UUID stationId) {
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesPlanService.java
......@@ -7,6 +7,7 @@ import org.springframework.lang.Nullable;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.entity.SalesPlanDetail;
import com.xyst.dinas.sales.web.request.SaleaPlanDetailQuery;
public interface SalesPlanService {
......@@ -40,10 +41,12 @@ public interface SalesPlanService {
public void approveSalesPlanForTemp(UUID id,int approveState,String approveMemo);
public KObject querySalesPlanDetailsByMasterId(UUID fromString);
// public KObject querySalesPlanDetailsByMasterId(UUID fromString);
// public Object querySalesPlanDetailsByMasterId(JSONObject jsonObject);
public KObject querySalesPlanDetailsByMasterIdWarehouse(UUID fromString, UUID fromString2);
public List<SalesPlanDetail> querySalesPlanDetails(UUID salesPlanId);
public List<SalesPlanDetail> querySalesPlanDetails(SaleaPlanDetailQuery saleaPlanDetailQuery);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesPlanController.java
......@@ -5,8 +5,6 @@ import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -16,11 +14,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import com.beecode.bap.workflow.core.BizProcessState;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.xyst.dinas.sales.entity.SalesPlanDetail;
import com.xyst.dinas.sales.service.SalesPlanService;
import com.xyst.dinas.sales.web.request.SaleaPlanApprove;
import com.xyst.dinas.sales.web.request.SaleaPlanDetailQuery;
@RestController
public class SalesPlanController {
......@@ -92,17 +90,23 @@ public class SalesPlanController {
* @param saleaPlanId
* @return
*/
@Deprecated
@ResponseBody
@RequestMapping(value = "/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.GET)
public Object querySalesPlanDetailsByMasterId(@RequestParam("saleaPlanId") UUID saleaPlanId) {
KObject salesPlanDetails = salesPlanService.querySalesPlanDetailsByMasterId(saleaPlanId);
return ResponseObj.success("success", salesPlanDetails);
}
// @ResponseBody
// @RequestMapping(value = "/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.GET)
// public Object querySalesPlanDetailsByMasterId(@RequestParam("saleaPlanId") UUID saleaPlanId) {
// KObject salesPlanDetails = salesPlanService.querySalesPlanDetailsByMasterId(saleaPlanId);
// return ResponseObj.success("success", salesPlanDetails);
//}
// @Deprecated
// @RequestMapping(value = "/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.POST)
// public Object querySalesPlanDetailsByMasterId(@RequestBody String parameter) {
// JSONObject jsonObject = new JSONObject(parameter);
// return ResponseObj.success("success", salesPlanService.querySalesPlanDetailsByMasterId(jsonObject));
// }
@GetMapping("/salesplan/querySalesPlanDetailsByMasterId/{saleaPlanId}")
public Object querySalesPlanDetails(@PathVariable UUID saleaPlanId) {
List<SalesPlanDetail> salesPlanDetails = salesPlanService.querySalesPlanDetails(saleaPlanId);
@PostMapping("/salesplan/querySalesPlanDetails")
public Object querySalesPlanDetails(@RequestBody SaleaPlanDetailQuery saleaPlanDetailQuery) {
List<SalesPlanDetail> salesPlanDetails = salesPlanService.querySalesPlanDetails(saleaPlanDetailQuery);
return ResponseObj.success("success", salesPlanDetails);
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/request/SaleaPlanDetailQuery.java 0 → 100644
package com.xyst.dinas.sales.web.request;
import java.io.Serializable;
import java.util.UUID;
public class SaleaPlanDetailQuery implements Serializable{
private static final long serialVersionUID = 1L;
private UUID salesPlanId;
private String purchaseSandUnitName;
public UUID getSalesPlanId() {
return salesPlanId;
}
public void setSalesPlanId(UUID salesPlanId) {
this.salesPlanId = salesPlanId;
}
public String getPurchaseSandUnitName() {
return purchaseSandUnitName;
}
public void setPurchaseSandUnitName(String purchaseSandUnitName) {
this.purchaseSandUnitName = purchaseSandUnitName;
}
}
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlan.mk
......@@ -65,6 +65,24 @@
</ref>
<description></description>
</field>
<field title='计划周期开始时间'>
<name>planningCycle.startTime</name>
<type>datetime</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
</ref>
<description></description>
</field>
<field title='计划周期结束时间'>
<name>planningCycle.endTime</name>
<type>datetime</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
</ref>
<description></description>
</field>
<field title='审批时间'>
<name>approveTime</name>
<type>datetime</type>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlan.jmx
......@@ -77,6 +77,26 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>planningCycle.startTime</m:name>
<m:title>计划周期开始时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>planningCycle.endTime</m:name>
<m:title>计划周期结束时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveTime</m:name>
<m:title>审批时间</m:title>
<m:type>datetime</m:type>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment