评价模块

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiEvaluateController.java

@@ -8,6 +8,7 @@ import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
 import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
+import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
 import com.elink.esua.epdc.service.ActInfoService;
 import com.elink.esua.epdc.service.EvaluateService;
 import org.apache.commons.lang3.StringUtils;
@@ -53,6 +54,17 @@ public class ApiEvaluateController {
     public Result<List<EvaluateOptionAppResultDTO>> getOptionList(EvaluateOptionAppFormDTO formDto) {
         return evaluateService.getOptionList(formDto);
     }
+    /**
+     * 评价状态
+     * @Params: [ formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("getAvailable")
+    public Result<RoleResultDTO> getAvailable() {
+        return evaluateService.getAvailable();
+    }
     /**
      * 评价提交
      * @Params: [ formDto]

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/EvaluateFeignClient.java

@@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
 import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
+import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
 import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback;
 import com.elink.esua.epdc.feign.fallback.EvaluateFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -61,6 +62,18 @@ public interface EvaluateFeignClient {
     @PostMapping(value = "custom/evaluateinfo/evaluateSubmit", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result evaluateSubmit(EvaluateSubmitFormDTO formDto);
 
+    /**
+     * 评价状态
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:42
+     */
+    @PostMapping(value = "custom/evaluaterole/getAppAvailable", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<RoleResultDTO> getAvailable();
+
+
+
 
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/EvaluateFeignClientFallback.java

@@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
 import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
+import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
 import com.elink.esua.epdc.feign.ActInfoFeignClient;
 import com.elink.esua.epdc.feign.EvaluateFeignClient;
 import org.springframework.stereotype.Component;
@@ -39,5 +40,10 @@ public class EvaluateFeignClientFallback implements EvaluateFeignClient {
     public Result evaluateSubmit(EvaluateSubmitFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "evaluateSubmit", formDto);
     }
+    @Override
+    public Result<RoleResultDTO> getAvailable() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getAvailable");
+    }
+
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/EvaluateService.java

@@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
 import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
+import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
 
 import java.util.List;
 
@@ -37,6 +38,8 @@ public interface EvaluateService {
      * @Date: 2019/11/19 16:37
      */
     Result<List<EvaluateOptionAppResultDTO>> getOptionList(EvaluateOptionAppFormDTO formDto);
+
+    Result<RoleResultDTO> getAvailable();
     /**
      * 评价提交
      * @Params: [userDetail, itemId]

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/EvaluateServiceImpl.java

@@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
 import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
+import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
 import com.elink.esua.epdc.feign.EvaluateFeignClient;
 import com.elink.esua.epdc.service.EvaluateService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,11 @@ public class EvaluateServiceImpl implements EvaluateService {
     public Result<List<EvaluateOptionAppResultDTO>> getOptionList(EvaluateOptionAppFormDTO formDto) {
         return evaluateFeignClient.getOptionList(formDto);
     }
+    @Override
+    public Result<RoleResultDTO> getAvailable() {
+        return evaluateFeignClient.getAvailable();
+    }
+
 
     @Override
     public Result evaluateSubmit(EvaluateSubmitFormDTO formDto){

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOfficerAppFormDTO.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto.evaluate.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -41,4 +42,20 @@ public class EvaluateOfficerAppFormDTO implements Serializable {
     @NotNull(message = "网格Id不能为空")
 	private Long gridId;
 
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private int pageIndex;
+    /**
+     * 页容量，默认20页
+     */
+    @Min(value = 1, message = "每页条数必须大于必须大于0")
+    private int pageSize = 10;
+
+    /**
+     * 街道ID
+     */
+    private Long deptId;
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleResultDTO.java

@@ -0,0 +1,22 @@
+
+package com.elink.esua.epdc.dto.evaluate.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * role表下拉字典项
+ *
+ * @author wgf
+ * @date 2020/02/10 09:29
+ */
+@Data
+public class RoleResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4827806651372425347L;
+
+    private String available;
+
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateRoleController.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO;
 import com.elink.esua.epdc.dto.evaluate.form.EvaluateRoleFormDTO;
+import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
 import com.elink.esua.epdc.modules.evaluate.excel.EvaluateRoleExcel;
 import com.elink.esua.epdc.modules.evaluate.service.EvaluateRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,6 +103,18 @@ public class EvaluateRoleController {
         EvaluateRoleDTO data = evaluateRoleService.getAvailable();
         return new Result<EvaluateRoleDTO>().ok(data);
     }
+    /**
+     * 获取可用标记
+     * @Author: wanggongfeng
+     * @return
+     */
+    @GetMapping("getAppAvailable")
+    public Result<RoleResultDTO> getAppAvailable(){
+        EvaluateRoleDTO data = evaluateRoleService.getAvailable();
+        RoleResultDTO role = new RoleResultDTO();
+        role.setAvailable(data.getAvailable());
+        return new Result<RoleResultDTO>().ok(role);
+    }
 
     /**
      * 更新可用标记

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.evaluate.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
 import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO;
+import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO;
 import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity;
@@ -66,7 +67,11 @@ public interface EvaluateOfficerDao extends BaseDao<EvaluateOfficerEntity> {
      */
     List<EvaluateOfficerCountResultDTO> getEvaluateOfficerCount(Map<String, Object> params);
 
-    List<EvaluateOfficerAppResultDTO> getDeptOfficer(Map<String, Object> params);
+    /**
+     * 干部列表
+     * @param formDto
+     */
+    List<EvaluateOfficerAppResultDTO> getDeptOfficer(EvaluateOfficerAppFormDTO formDto);
 
     /**
      * 街道干部管理表干部人数加1

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
@@ -103,6 +104,8 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
 
     @Override
     public List<EvaluateOfficerAppResultDTO> getDeptOfficer(EvaluateOfficerAppFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
         Result<CompleteDeptDTO> completeDept = sysFeignClient.getCompleteDept(formDto.getGridId());
         if (!completeDept.success()) {
             throw new RenException("获取街道失败");
@@ -112,9 +115,8 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
             throw new RenException("评价功能停用");
         }
         CompleteDeptDTO completeDeptDTO = completeDept.getData();
-        Map<String, Object> params = new HashMap<String, Object>();
-        params.put("deptId", completeDeptDTO.getStreetId());
-        List<EvaluateOfficerAppResultDTO> list = baseDao.getDeptOfficer(params);
+        formDto.setDeptId(completeDeptDTO.getStreetId());
+        List<EvaluateOfficerAppResultDTO> list = baseDao.getDeptOfficer(formDto);
         return list;
     }
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml

@@ -291,6 +291,7 @@
             and DEPT_ID = #{deptId}
         </if>
         order by SORT, CREATED_TIME desc
+        LIMIT #{pageIndex},#{pageSize}
     </select>
 
 </mapper>