数采仪列表 事后审核控制

src/main/java/com/cn/esermis/controller/DataAcquisitionInstrumentController.java

@@ -63,6 +63,8 @@ public class DataAcquisitionInstrumentController {
                 List<String> companyCodes = dataAcquisitionInstrumentService.getComponyListAll(vo.getCompanyName());
                 if (!companyCodes.isEmpty()) {
                     wrapper.in("company_code", companyCodes);
+                }else{
+                    return success(new Page<>());
                 }
             }else{
                 List<String> companyCodes = dataAcquisitionInstrumentService.getComponyList(vo.getCompanyName(), companyId);

src/main/java/com/cn/esermis/controller/PostMarkingController.java

@@ -127,10 +127,10 @@ public class PostMarkingController
     public Object edit(@RequestBody PostMarking postMarking)
     {
         // 审核流程控制
-        if (postMarking.getVerificationStatus() !=null && postMarking.getReasonClassification()!=null){
-            postMarking.setUnitType(1);
-        }
-        if (postMarking.getUnitType() == 3){
+//        if (postMarking.getVerificationStatus() !=null && postMarking.getReasonClassification()!=null){
+//            postMarking.setUnitType(1);
+//        }
+        if (postMarking.getUnitType() == 3 && postMarking.getUnitOpinion()==null){
             return error("请填写驳回原因。");
         }
         postMarkingService.updateById(postMarking);

src/main/java/com/cn/esermis/dpld/entity/PostMarking.java

@@ -49,12 +49,18 @@ public class PostMarking {
     private Integer verificationStatus;
 
     /**
-     * 月排放量单位
+     * 原因分类  1停炉、2故障
      */
     @TableField(value = "reason_classification")
     private Integer reasonClassification;
 
     /**
+     * 原因分类  1停炉、2故障
+     */
+    @TableField(value = "specific_reasons")
+    private Integer specificReasons;
+
+    /**
      * 管理员核实状态  1属实、2不属实
      */
     @TableField(value = "verifies_status")
@@ -63,7 +69,7 @@ public class PostMarking {
      * 管理员分类  1停炉、2故障
      */
     @TableField(value = "management_classification")
-    private String managementClassification;
+    private Integer managementClassification;
 
     /**
      * 管理员具体原因