Merge branch 'dev' of depot-qinghai/depot-business-qinghai into master

src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractServiceImpl.java

@@ -126,7 +126,10 @@ public class BusinessContractServiceImpl implements BusinessContractService {
         // 设置审批状态为，审批待提交.
         contract.setAuditState(AuditType.UNSUBMIT.getAuditCode());
         // 创建时间.
-        contract.setCreateTime(new Date());
+        Date date = new Date();
+        contract.setCreateTime(date);
+        contract.setUpdateTime(date);
+        contract.setUpdatetime(date);
         // 设置登录人信息.
         contract.setCreater(realName);
         contract.setCreaterId(userId);
@@ -183,6 +186,9 @@ public class BusinessContractServiceImpl implements BusinessContractService {
      * 修改.
      */
     public void update(BusinessContract contract, List<BusinessStoreWareDetail> storeWareDetailList) {
+    	Date date = new Date();
+        contract.setUpdateTime(date);
+        contract.setUpdatetime(date);
         contractMapper.updateByPrimaryKey(contract);
        /* // 修改fileIds对应附件的bid为当前计划的id.
         businessFileService.updateFileByFileIdsAndBid(fileIds, contract.getId(),"contract");

src/main/java/com/chinaitop/depot/pg/mapper/BusinessPgGopsPlanMapper.xml

@@ -407,6 +407,9 @@
     LEFT JOIN depot_qh.org_info d on a.org_id = d.org_id
     LEFT JOIN province_all.biz_unit_info b on d.unit_info_id = b.id
     where 1=1
+    <if test="pageParam.orgId !=null and pageParam.orgId!=''">
+      and a.org_id =#{pageParam.orgId}
+    </if>
     <if test="pageParam.unitName !=null and pageParam.unitName!=''">
       and b.dwmc like concat("%",#{pageParam.unitName},"%")
     </if>

src/main/java/com/chinaitop/depot/pg/param/BusinessPgGopsPlanPageParam.java

@@ -19,6 +19,9 @@ public class BusinessPgGopsPlanPageParam {
     @ApiModelProperty(value = "库区名称")
     private String orgName;
 
+    @ApiModelProperty(value = "库区Id")
+    private String orgId;
+
     @ApiModelProperty(value = "企业名称")
     private String unitName;
     /** 性质id */

src/main/java/com/chinaitop/depot/rp/service/impl/BusinessRpReportServiceImpl.java

@@ -121,12 +121,13 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
         BusinessRpInboundExample businessRpInboundExample =new BusinessRpInboundExample();
        businessRpReport.setUpdateTime(new Date());
         if(businessRpReport.getStatus()==0){
-            if(businessRpReport.getId()!=null){//修改
+            if(businessRpReport.getId()!=null){
                 businessRpReportMapper.updateByPrimaryKeySelective(businessRpReport);
                 businessRpInboundMapper.deleteByReportId(businessRpReport.getId());
                 businessRpOutboundMapper.deleteByReportId(businessRpReport.getId());
                 List<BusinessRpInbound> inList =businessRpReport.getBusinessRpInboundList();
                 for (BusinessRpInbound br: inList) {
+
                     br.setCreatedate(new Date());
                     br.setUpdatedate(new Date());
                     br.setRpReportId(businessRpReport.getId());
@@ -139,7 +140,7 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
                     ou.setRpReportId(businessRpReport.getId());
                     businessRpOutboundMapper.insertSelective(ou);
                 }
-            }else{//保存
+            }else{
                 businessRpReport.setCreateTime(new Date());
                 businessRpReport.setUpdateTime(new Date());
                 businessRpReportMapper.insert(businessRpReport);
@@ -148,7 +149,7 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
                     br.setCreatedate(new Date());
                     br.setUpdatedate(new Date());
                     br.setRpReportId(businessRpReport.getId());
-                    businessRpInboundMapper.insertSelective1(br);
+                    businessRpInboundMapper.insertSelective(br);
                 }
                 List<BusinessRpOutbound> outlist =businessRpReport.getBusinessRpOutboundList();
                 for (BusinessRpOutbound ou: outlist) {