Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -20,6 +20,7 @@ import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyEntity;
@@ -795,4 +796,13 @@ public class DemoController {
         screenProjectQuantityOrgMonthlyService.extractionProjectOrgMonthly(customerId, monthId);
         return new Result();
     }
+
+    @Autowired
+    private ScreenGrassrootsGovernDataAbsorptionService ndddYhjfService;
+
+    @PostMapping("diff")
+    public Result diff(@RequestBody ScreenCentralZoneDataFormDTO param){
+        ndddYhjfService.difficultyDataHub(param);
+        return new Result();
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenDifficultyImgDataEntity.java

@@ -7,6 +7,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 
 /**
@@ -19,6 +20,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper=false)
 @TableName("screen_difficulty_img_data")
 @AllArgsConstructor
+@NoArgsConstructor
 public class ScreenDifficultyImgDataEntity extends BaseEpmetEntity {
 
     private static final long serialVersionUID = 1L;

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -159,11 +159,10 @@
             i.GRID_ID AS "gridId"
         FROM
             issue i
-        INNER JOIN issue_project_relation ipr ON i.ID = ipr.ISSUE_ID
+        INNER JOIN issue_project_relation ipr ON (i.ID = ipr.ISSUE_ID  AND ipr.DEL_FLAG = '0')
         WHERE
               i.DEL_FLAG = '0'
-            AND ipr.DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
+            AND i.CUSTOMER_ID = #{customerId}
     </select>
 
     <select id="selectGridProjectList" resultType="com.epmet.entity.issue.IssueEntity">