审批系统问题修改

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInfo.java

@@ -28,6 +28,7 @@ public class ApprovalInfo implements Serializable{
     private Integer approvalAdminId;//审核人adminid
     private Integer selectType;//查询类型 1.我发起的 2.我审核的 3.仓库确认
     private String selectName;//查询内容 姓名 订单名称 备注
+    private String adminName;//管理员姓名
 
     public Integer getApprovalId() {
         return approvalId;
@@ -172,4 +173,12 @@ public class ApprovalInfo implements Serializable{
     public void setSelectName(String selectName) {
         this.selectName = selectName;
     }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInventoryRecords.java

@@ -20,6 +20,11 @@ public class ApprovalInventoryRecords implements Serializable {
     private Integer operatingAdminId;//操作人
     private Integer operatingTime;//
 
+    private String brandName;//品牌名称
+    private String productModel;//产品型号
+    private String productUnit;//单位
+    private Integer productBoxNumber;//箱数/套数
+
     public Integer getStorageId() {
         return storageId;
     }
@@ -115,4 +120,36 @@ public class ApprovalInventoryRecords implements Serializable {
     public void setItemId(Integer itemId) {
         this.itemId = itemId;
     }
+
+    public String getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+
+    public String getProductModel() {
+        return productModel;
+    }
+
+    public void setProductModel(String productModel) {
+        this.productModel = productModel;
+    }
+
+    public String getProductUnit() {
+        return productUnit;
+    }
+
+    public void setProductUnit(String productUnit) {
+        this.productUnit = productUnit;
+    }
+
+    public Integer getProductBoxNumber() {
+        return productBoxNumber;
+    }
+
+    public void setProductBoxNumber(Integer productBoxNumber) {
+        this.productBoxNumber = productBoxNumber;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -87,10 +87,12 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             throw new RuntimeException("添加生产审批信息失败");
         }
         //添加合同信息
-        for(ApprovalProductionContract approvalProductionContract : productionContracts){
-            approvalProductionContract.setApprovalId(approvalProduction.getProductionId());
-            approvalProductionContract.setContractName(approvalProduction.getApplicantName()+"的审批订单合同");
-            approvalOrderMapper.insertProductionContract(approvalProductionContract);
+        if(productionContracts.size() > 0){
+            for(ApprovalProductionContract approvalProductionContract : productionContracts){
+                approvalProductionContract.setApprovalId(approvalProduction.getProductionId());
+                approvalProductionContract.setContractName(approvalProduction.getApplicantName()+"的审批订单合同");
+                approvalOrderMapper.insertProductionContract(approvalProductionContract);
+            }
         }
         //封装生产审批产品项
         for(ApprovalProductionItem approvalProductionItem : listApprovalProductionItem){
@@ -253,6 +255,11 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             records.setShouldStorage(productionItem.getItemLackNumber());
             records.setLackNumber(productionItem.getItemLackNumber() - jsonRecords.getInt("actualStorage"));
             records.setOperatingAdminId(admin.getAdminId());
+            records.setItemId(jsonRecords.getInt("itemId"));
+            records.setBrandName(productionItem.getItemBrandName());
+            records.setProductModel(productionItem.getItemProductModel());
+            records.setProductUnit(productionItem.getItemProductUnit());
+            records.setProductBoxNumber(productionItem.getItemProductBoxNumber());
             if(approvalOrderMapper.insertInventoryRecords(records) < 1){
                 return new ResponseJson(200, "添加入库记录失败", 500);
             }
@@ -402,12 +409,14 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                 HistoricalRecord recordinfo = new HistoricalRecord();
                 recordinfo.setApprovalId(approvalInfo.getApprovalId());
                 recordinfo.setRecordState(6);
+                recordinfo.setTaskId(record.getTaskId());
                 recordinfo.setApprovalTime(new Date());
                 if(approvalOrderMapper.updateHistoricalRecord(recordinfo) < 1){
                     rj = ResponseJson.getFAILURE();
                     rj.setResultMsg("修改其它审核人审核历史记录状态失败！");
                     return  rj;
                 }
+                recordinfo.setTaskId(null);
                 recordinfo.setAdminId(admin.getAdminId());
                 recordinfo.setRecordState(2);
                 if(approvalOrderMapper.updateHistoricalRecord(recordinfo) < 1){
@@ -563,12 +572,14 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                 HistoricalRecord recordinfo2 = new HistoricalRecord();
                 recordinfo2.setApprovalId(approvalInfo.getApprovalId());
                 recordinfo2.setRecordState(6);
+                recordinfo2.setTaskId(historicalRecord.getTaskId());
                 recordinfo2.setApprovalTime(new Date());
                 if(approvalOrderMapper.updateHistoricalRecord(recordinfo2) < 1){
                     rj = ResponseJson.getFAILURE();
                     rj.setResultMsg("修改其它审核人历史记录状态为其他人已审核！");
                     return  rj;
                 }
+                recordinfo2.setTaskId(null);
                 recordinfo2.setAdminId(admin.getAdminId());
                 recordinfo2.setRecordState(3);
                 if(approvalOrderMapper.updateHistoricalRecord(recordinfo2) < 1){

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -14,6 +14,7 @@
     <result column="approval_details" property="approvalDetails" jdbcType="VARCHAR" />
     <result column="approval_remark" property="approvalRemark" jdbcType="VARCHAR" />
     <result column="approval_create_time" property="approvalCreateTime" jdbcType="TIMESTAMP" />
+    <result column="admin_name" property="adminName" jdbcType="VARCHAR" />
     <collection property="approvalProduction" column="approval_id" ofType="ApprovalProduction" select="getApprovalProduction"/>
     <collection property="approvalApplyPick" column="approval_id" ofType="ApprovalApplyPick" select="getApplyPick"/>
     <collection property="listProductionContract" column="approval_id" ofType="ApprovalProductionContract" select="listProductionContract"/>
@@ -310,9 +311,11 @@
     ai.activiti_id,
     ai.approval_details,
     ai.approval_remark,
-    ai.approval_create_time
+    ai.approval_create_time,
+    sa.admin_name
     from tb_rst_approval_info ai
     LEFT JOIN  tb_rst_historical_record hr ON ai.approval_id = hr.approval_id
+    LEFT JOIN  tb_rst_sys_admin sa ON ai.admin_id = sa.admin_id
     <where>
       <if test="approvalId != null and approvalId != ''">
         ai.approval_id = #{approvalId}
@@ -549,12 +552,18 @@
     actual_storage,
     lack_number,
     operating_admin_id,
-    operating_time
+    operating_time,
+    brand_name,
+    product_model,
+    product_unit,
+    product_box_number
+
     )
     VALUES
     (#{approvalId},#{itemId},#{storageState},#{productId}
     ,#{productName},#{colorName},#{shouldStorage}
-    ,#{actualStorage},#{lackNumber},#{operatingAdminId},NOW())
+    ,#{actualStorage},#{lackNumber},#{operatingAdminId},NOW(),
+    #{brandName},#{productModel},#{productUnit},#{productBoxNumber})
   </insert>
 
   <!--查询单个审批产品项信息-->
@@ -668,7 +677,11 @@
     actual_storage actualStorage,
     lack_number lackNumber,
     operating_admin_id operatingAdminId,
-    operating_time operatingTime
+    operating_time operatingTime,
+    brand_name brandName,
+    product_model productModel,
+    product_unit productUnit,
+    product_box_number productBoxNumber
     from tb_rst_approval_inventory_records
     where
     approval_id = #{approvalId}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -104,13 +104,15 @@ public class ApprovalController {
         }
         //封装生产审批合同
         List<ApprovalProductionContract> listProductionContract = new ArrayList<ApprovalProductionContract>();
-        JSONArray jsonproductionContracts = JSONArray.fromObject(productionContracts);
-        for (int i = 0; i < jsonproductionContracts.size(); i++) {
-            JSONObject contract = jsonproductionContracts.getJSONObject(i);
-            ApprovalProductionContract contractInfo = new ApprovalProductionContract();
-            contractInfo.setContractUrl(contract.getString("contractUrl"));
-            contractInfo.setContractType(contract.getString("contractType"));
-            listProductionContract.add(contractInfo);
+        if(productionContracts != null){
+            JSONArray jsonproductionContracts = JSONArray.fromObject(productionContracts);
+            for (int i = 0; i < jsonproductionContracts.size(); i++) {
+                JSONObject contract = jsonproductionContracts.getJSONObject(i);
+                ApprovalProductionContract contractInfo = new ApprovalProductionContract();
+                contractInfo.setContractUrl(contract.getString("contractUrl"));
+                contractInfo.setContractType(contract.getString("contractType"));
+                listProductionContract.add(contractInfo);
+            }
         }
         boolean returnValue = approvalOrderService.insertApprovalProduction(approvalProduction,listApprovalProductionItem,listProductionContract,taskinfo,openId);
         if(!returnValue){