一码通西咸存量数据处理

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -88,5 +88,6 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
     List<Map<String, Object>> getEquCategory(@Param("recordList") List<String> recordList);
 
 
+    List<String> selectXiXianNew();
 }
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/IEquipmentCategoryService.java

@@ -21,7 +21,7 @@ public interface IEquipmentCategoryService {
 
     Page equipClaimOverview();
 
-    Map<String, String> createSupervisorCode(Map<String, Object> map, String record);
+    Map<String, String> createSupervisorCode(Map<String, Object> map);
 
     List<LinkedHashMap> getTree();
     List<LinkedHashMap> creatTree();
@@ -42,5 +42,5 @@ public interface IEquipmentCategoryService {
 
     ResponseModel submit(Map<String, Object> map);
 
-    void creatXiXian();
+    void creatXiXian(String type);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -601,13 +601,14 @@
         SELECT
             ibjoi."RECORD"
         FROM
-            "biz_jg_supervisory_code" bjsc
-                LEFT JOIN idx_biz_jg_other_info ibjoi ON bjsc.code96333 = ibjoi."CODE96333"
+            idx_biz_jg_other_info ibjoi
                 LEFT JOIN idx_biz_jg_supervision_info ibjsi ON ibjsi.record = ibjoi.record
+                LEFT JOIN "biz_jg_supervisory_code" bjsc ON bjsc.supervisory_code = ibjoi."SUPERVISORY_CODE"
         WHERE
             ibjsi."ORG_BRANCH_CODE" LIKE'50*18667%'
+          AND ibjoi."SUPERVISORY_CODE" NOT LIKE'X%'
+          AND ( ibjoi."CODE96333" NOT LIKE'31%' OR ibjoi."CODE96333" IS NULL )
           AND ( bjsc.status = '1' OR bjsc.status = '2' )
-          AND bjsc.supervisory_code NOT LIKE 'X%'
           AND create_status = 1
           AND "CLAIM_STATUS" = '已认领';
     </select>
@@ -665,4 +666,18 @@
             AND "CLAIM_STATUS" = '已认领'
             );
     </delete>
+
+    <select id="selectXiXianNew" resultType="java.lang.String">
+        SELECT
+            ibjoi."RECORD"
+        FROM
+            idx_biz_jg_other_info ibjoi
+                LEFT JOIN idx_biz_jg_supervision_info ibjsi ON ibjsi.record = ibjoi.record
+                LEFT JOIN "biz_jg_supervisory_code" bjsc ON bjsc.supervisory_code = ibjoi."SUPERVISORY_CODE"
+        WHERE
+            ibjsi."ORG_BRANCH_CODE" LIKE'50*18667%'
+          AND ibjoi."SUPERVISORY_CODE" NOT LIKE'X%'
+          AND ( ibjoi."CODE96333" NOT LIKE'31%' OR ibjoi."CODE96333" IS NULL )
+          AND "CLAIM_STATUS" = '已认领';
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java

@@ -217,7 +217,7 @@ public class EquipmentCategoryController extends BaseController {
 	@RequestMapping(value = "/createSupervisorCode", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "生成监管码和96333码", notes = "生成监管码和96333码")
 	public ResponseModel<Object> createSupervisorCode(@RequestBody Map<String,Object> map) {
-		return ResponseHelper.buildResponse(equipmentCategoryService.createSupervisorCode(map,null));
+		return ResponseHelper.buildResponse(equipmentCategoryService.createSupervisorCode(map));
 	}
 
 	/**
@@ -307,8 +307,8 @@ public class EquipmentCategoryController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/creatXiXian")
 	@ApiOperation(httpMethod = "GET", value = "西咸存量数据处理功能", notes = "西咸存量数据处理功能")
-	public ResponseModel<Object> creatXiXian() {
-		equipmentCategoryService.creatXiXian();
+	public ResponseModel<Object> creatXiXian(@RequestParam String type) {
+		equipmentCategoryService.creatXiXian(type);
 		return ResponseHelper.buildResponse("ok");
 	}