Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PointRecordFormDTO.java

@@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description
@@ -27,12 +28,12 @@ public class PointRecordFormDTO implements Serializable {
      * 开始时间
      */
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private String startTime;
+    private Date startTime;
     /**
      * 结束时间
      */
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private String endTime;
+    private Date endTime;
     private Integer pageNo = 1;
     private Integer pageSize = 10;
     private String customerId;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java

@@ -27,7 +27,7 @@ public class IcPartyUnitCompletionController {
     private IcPartyUnitCompletionService icPartyUnitCompletionService;
 
     @PostMapping("list")
-    public Result<PageData<IcPartyUnitCompletionDTO>> page(@RequestParam CompletionFormDTO formDTO){
+    public Result<PageData<IcPartyUnitCompletionDTO>> page(@RequestBody CompletionFormDTO formDTO){
         PageData<IcPartyUnitCompletionDTO> page = icPartyUnitCompletionService.page(formDTO);
         return new Result<PageData<IcPartyUnitCompletionDTO>>().ok(page);
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java

@@ -128,5 +128,5 @@ public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
      */
     List<PointRecordDTO> getPointRecordList(PointRecordFormDTO formDTO);
 
-    int getTotalPoint(PointRecordFormDTO formDTO);
+    Integer getTotalPoint(PointRecordFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -1662,9 +1662,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             result.setTotalPoint(NumConstant.ZERO);
             result.setPage(new PageData<>(Collections.emptyList(), NumConstant.ZERO));
         }
-
+        Integer total = baseDao.getTotalPoint(formDTO);
         //总积分
-        result.setTotalPoint(baseDao.getTotalPoint(formDTO));
+        result.setTotalPoint(null == total?NumConstant.ZERO:total);
         //分页查询
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<PointRecordDTO> list = baseDao.getPointRecordList(formDTO);

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -591,10 +591,10 @@
             a.DEL_FLAG = '0'
             AND a.`STATUS` = 'finished'
             AND a.EVALUATE_FLAG = 1
-            <if test="null != startTime">
+            <if test="null != startTime and startTime != ''">
                 AND c.EVALUATE_TIME &gt;= #{startTime}
             </if>
-            <if test="null != endTime">
+            <if test="null != endTime and endTime != ''">
                 AND c.EVALUATE_TIME &lt;= #{endTime}
             </if>
         ORDER BY c.EVALUATE_TIME DESC

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -585,5 +585,7 @@ public interface GovOrgOpenFeignClient {
     Result<IcResiUserOrgMsgResultDTO> icResiUserOrgMsg(@RequestBody IcResiUserOrgMsgFormDTO formDTO);
 
     @PostMapping("/gov/org/customergrid/getstaffgridlist")
-    Result<List<CustomerStaffGridResultDTO>> getStaffGridList(@RequestParam("customerId") String customerId, @RequestParam("orgId") String orgId, @RequestParam("orgType") String orgType);
+    Result<List<CustomerStaffGridResultDTO>> getStaffGridList(@RequestParam("customerId") String customerId,
+                                                              @RequestParam("orgId") String orgId,
+                                                              @RequestParam("orgType") String orgType);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -382,6 +382,6 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
 
     @Override
     public Result<List<CustomerStaffGridResultDTO>> getStaffGridList(String customerId, String orgId, String orgType) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffGridList", orgId, orgType);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffGridList",customerId, orgId, orgType);
     }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridStaffFormDTO.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**
@@ -38,7 +39,7 @@ public class GridStaffFormDTO extends PageFormDTO {
     /**
      * 角色key
      */
-    @NotBlank(message = "角色Key不能为空", groups = {DefaultGroup.class})
+    @NotEmpty(message = "角色Key不能为空", groups = {DefaultGroup.class})
     private List<String> roleKeyList;
 
     /**