Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/FineExampleFormDTO.java

@@ -22,6 +22,4 @@ public class FineExampleFormDTO implements Serializable {
      */
     @NotBlank(message = "机关ID不能为空",groups = {FineExample.class})
     private String agencyId;
-
-    private String customerId;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java

@@ -30,7 +30,7 @@ public class PartyMemberLeadController {
      * @date 2020/8/20 1:56 下午
      */
     @PostMapping("fineexample")
-    public Result<FineExampleResultDTO> fineExample(@RequestHeader("CustomerId") String customerId, @RequestBody FineExampleFormDTO fineExampleFormDTO){
+    public Result<FineExampleResultDTO> fineExample(@RequestBody FineExampleFormDTO fineExampleFormDTO){
         ValidatorUtils.validateEntity(fineExampleFormDTO, FineExampleFormDTO.FineExample.class);
         return new Result<FineExampleResultDTO>().ok(partyMemberLeadService.fineExample(fineExampleFormDTO));
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java

@@ -70,14 +70,11 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public FineExampleResultDTO fineExample(FineExampleFormDTO fineExampleFormDTO) {
-        String customerId = fineExampleFormDTO.getCustomerId();
+        ScreenCustomerAgencyDTO agencyInfo = customerAgencyDao.selectByAgencyId(fineExampleFormDTO.getAgencyId());
-        String areaCode = null;
+        if(null == agencyInfo) throw new RenException("未找到对应的机关");
-        if(StringUtils.isBlank(customerId)){
+        String customerId = agencyInfo.getCustomerId();
-            ScreenCustomerAgencyDTO agencyInfo = customerAgencyDao.selectByAgencyId(fineExampleFormDTO.getAgencyId());
+        String areaCode = agencyInfo.getAreaCode();
-            if(null == agencyInfo) throw new RenException("未找到对应的机关");
+
-            customerId = agencyInfo.getCustomerId();
-            areaCode = agencyInfo.getAreaCode();
-        }
         Result<List<String>> crmResponse = operCrmOpenFeignClient.getAllSubCustomerIds(customerId);
         List<String> subCustomers;
         if(null == crmResponse || !crmResponse.success())

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenListInfoDao.xml

@@ -3,15 +3,19 @@
 
 <mapper namespace="com.epmet.datareport.dao.plugins.ScreenListInfoDao">
     <select id="selectList" parameterType="java.lang.String" resultType="com.epmet.dto.result.plugins.OneListResultDTO">
+
+       SELECT * FROM (
         SELECT
             sli.LIST_ID AS listId,
-            sli.LIST_NAME AS listName
+            concat(@rank,'.',sli.LIST_NAME) AS listName,
+            @rank := @rank + 1
         FROM
-            screen_list_info sli
+            screen_list_info sli, ( SELECT  @rank := 1 ) a
         WHERE
             sli.DEL_FLAG = '0'
-            AND sli.CUSTOMER_ID = #{customerId}
+             AND sli.CUSTOMER_ID = #{customerId}
         ORDER BY
             sli.SORT ASC
+            )temp
     </select>
 </mapper>