增加按钮显示影藏

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceDto.java

@@ -94,8 +94,8 @@ public class AcceptanceDto extends BaseDto {
 
     private Long peasantHouseholdId;
 
-
-
+    //验收单id
+    private Long acceptanceCheckItemId;
 
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/NumberUtil.java

@@ -35,30 +35,33 @@ public class NumberUtil {
     //当天生成4位随机不重复数
     public static Integer getnum(){
         Random rand = new Random();
-     if(needQueryResProductList.containsKey("num")&&needQueryResProductList.get("num")!=null&&needQueryResProductList.get("num")<9999){
-         Integer num= needQueryResProductList.get("num")+rand.nextInt(100) + 1;
-         needQueryResProductList.put("num",num);
-         return num;
-     }else{
-      int num=  1000+ rand.nextInt(100) + 1;
-      needQueryResProductList.put("num",num);
+        if(needQueryResProductList.containsKey("num")&&needQueryResProductList.get("num")!=null&&needQueryResProductList.get("num")<9999){
+            Integer num= needQueryResProductList.get("num")+rand.nextInt(100) + 1;
+            needQueryResProductList.put("num",num);
+            return num;
+        }else{
+            int num = rand.nextInt(9000) + 1;
+            needQueryResProductList.put("num",num);
 
-         return num;
-     }
+            return num;
+        }
     }
 
+
+
+
     public static String getCode(String type,String code, String address ){
 
 
 
         code= code+ getChineseStr(address.replace("省","")
-                    .replace("市","")
-                    .replace("区","")
-                    .replace("县","")
-                    .replace(",",""));
+                .replace("市","")
+                .replace("区","")
+                .replace("县","")
+                .replace(",",""));
         code= type+code+dateFormat()+getnum();
 
-       return  code;
+        return  code;
     }
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml

@@ -33,6 +33,8 @@
             bga.next_executor_ids nextExecutorIds,
             bga.next_node_key  nextNodeKey,
 
+        (select  hygf_acceptance_check_item.sequence_nbr from hygf_acceptance_check_item where hygf_acceptance_check_item.work_order_power_station_id=bga.work_order_power_station_id LIMIT 1) acceptanceCheckItemId,
+
             hygf_work_order.region_company_id   regionCompanyId,
             ph.regional_companies_code AS regionalCompaniesCode,
             ph.regional_companies_name AS regionalCompaniesName,