一码通使用es

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

@@ -31,4 +31,6 @@ public interface CategoryOtherInfoMapper extends BaseMapper<CategoryOtherInfo> {
     Map<String, Object> selectDataById(String id);
 
     CategoryOtherInfo queryInitCode(@Param("initCode") @NonNull String initCode);
+
+    void updateEsStatus(String id);
 }

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

@@ -47,7 +47,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
     String getUnitCodeByRecord(String record);
 
 
-    List<UseUnitCreditCodeCategoryDto> useUnitCreditCodeCategoryCount();
+    List<UseUnitCreditCodeCategoryDto> useUnitCreditCodeCategoryCount(@Param("unitCodes") List<String> unitCodes, @Param("orgBranchCodes") List<String> orgBranchCodes);
 
 
     List<EquipExportVo> getEquipExportData(@Param("dto") EquipExportDto dto);

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

@@ -50,6 +50,7 @@
     </select>
     <select id="selectDataById" resultType="java.util.Map">
         SELECT SEQUENCE_NBR,
+               REC_DATE,
                ORG_BRANCH_NAME,
                ORG_BRANCH_CODE,
                USE_UNIT_NAME,
@@ -61,7 +62,7 @@
                CODE96333,
                EQU_CODE,
                SUPERVISORY_CODE,
-               USE_PLACE    ,
+               USE_PLACE,
                ADDRESS,
                EQU_STATE,
                STATUS
@@ -92,4 +93,10 @@
         SET "EDIT_STATUS" = #{editStatus}
         WHERE "SUPERVISORY_CODE" = #{supervisorCode}
     </update>
+
+    <update id="updateEsStatus">
+        UPDATE idx_biz_jg_use_info
+        SET "IS_NOT_ES" = '1'
+        WHERE "RECORD" = #{id}
+    </update>
 </mapper>

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

@@ -306,21 +306,33 @@
 
     <select id="useUnitCreditCodeCategoryCount" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.UseUnitCreditCodeCategoryDto">
         SELECT
-          ibjsi."ORG_BRANCH_CODE",
-          ibjui."USE_UNIT_CREDIT_CODE",
-          ibjoi."CLAIM_STATUS",
-          ibjri."EQU_LIST",
-          COUNT ( * ) as TOTAL
+        ibjsi."ORG_BRANCH_CODE",
+        ibjui."USE_UNIT_CREDIT_CODE",
+        ibjoi."CLAIM_STATUS",
+        ibjri."EQU_LIST",
+        COUNT ( * ) as TOTAL
         FROM
-          idx_biz_jg_use_info ibjui
-          LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.RECORD = ibjri.RECORD
-          LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
-          LEFT JOIN idx_biz_jg_supervision_info ibjsi ON  ibjsi."RECORD" = ibjui."RECORD"
+        idx_biz_jg_use_info ibjui
+        LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.RECORD = ibjri.RECORD
+        LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
+        LEFT JOIN idx_biz_jg_supervision_info ibjsi ON ibjsi."RECORD" = ibjui."RECORD"
         where
-          ibjoi."CLAIM_STATUS" <![CDATA[ <> ]]> ''
-          and ibjui."USE_UNIT_CREDIT_CODE" <![CDATA[ <> ]]> ''
-          and ibjri."EQU_LIST" <![CDATA[ <> ]]> ''
-          GROUP BY ibjui."USE_UNIT_CREDIT_CODE",ibjsi."ORG_BRANCH_CODE", ibjoi."CLAIM_STATUS",ibjri."EQU_LIST"
+        ibjoi."CLAIM_STATUS" <![CDATA[ <> ]]> ''
+        and ibjui."USE_UNIT_CREDIT_CODE" <![CDATA[ <> ]]> ''
+        and ibjri."EQU_LIST" <![CDATA[ <> ]]> ''
+        <if test="unitCodes !=null and unitCodes.size>0">
+            and ibjui.USE_UNIT_CREDIT_CODE in
+            <foreach collection="unitCodes" separator="," item="unitCode" open="(" close=")">
+                #{unitCode}
+            </foreach>
+        </if>
+        <if test="orgBranchCodes !=null and orgBranchCodes.size>0">
+            and ibjsi.ORG_BRANCH_CODE in
+            <foreach collection="orgBranchCodes" separator="," item="orgBranchCode" open="(" close=")">
+                #{orgBranchCode}
+            </foreach>
+        </if>
+        GROUP BY ibjui."USE_UNIT_CREDIT_CODE",ibjsi."ORG_BRANCH_CODE", ibjoi."CLAIM_STATUS",ibjri."EQU_LIST"
     </select>
     <select id="getEquipExportData" resultType="com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo">
         select ORG_BRANCH_NAME as orgBranchName,

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

@@ -368,9 +368,9 @@ public class EquipmentCategoryController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@GetMapping(value = "/test")
-	@ApiOperation(httpMethod = "GET", value = "test", notes = "test")
-	public ResponseModel<String> test() {
+	@GetMapping(value = "saveEquipmentCategoryToEs")
+	@ApiOperation(httpMethod = "GET", value = "一码通数据初始化至es", notes = "一码通数据初始化至es")
+	public ResponseModel<String> saveEquipmentCategoryToEs() {
 		equipmentCategoryServiceImpl.saveEs();
 		return ResponseHelper.buildResponse("success");
 	}