Merge remote-tracking branch 'origin/thirdStage' into thirdStage

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java

@@ -9,11 +9,13 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
 import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard;
 import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm;
+import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermApproval;
 import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser;
 import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardTermApprovalService;
 import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardTermUserService;
 import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStandardVO;
 import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO;
@@ -124,7 +126,7 @@ public class ProcessProjectStandardController extends JeroController<ProcessProj
     }
 
     /**
-     * 项目合规评估流程-查询条款列表
+     * 法规合规评估流程-查询条款列表
      * @return
      */
     @AutoLog(value = "法规合规评估流程-查询条款列表")
@@ -144,15 +146,15 @@ public class ProcessProjectStandardController extends JeroController<ProcessProj
     }
 
     /**
-     * 项目合规评估流程-查询条款列表
+     * 法规合规评估流程-查询立项结果列表
      * @return
      */
-    @AutoLog(value = "法规合规评估流程-查询评估列表")
-    @ApiOperation(value = "查询评估列表")
-    @GetMapping("/getTermUserList")
-    public Result<IPage<ProcessProjectStandardTermUser>> getTermUserList(ProcessProjectStandardTermUser processProjectStandardTermUser, Integer pageNo, Integer pageSize,
-                                                                    HttpServletRequest req) {
-        IPage<ProcessProjectStandardTermUser> page = processProjectStandardService.getTermUserList(processProjectStandardTermUser, pageNo, pageSize, req);
+    @DictPoint
+    @AutoLog(value = "法规合规评估流程-查询立项结果列表")
+    @ApiOperation(value = "查询立项结果列表")
+    @GetMapping("/getTermApprovalList")
+    public Result<List<ProcessProjectStandardTermApproval>> getTermApprovalList(@RequestParam(name="id") String id) {
+        List<ProcessProjectStandardTermApproval> page = processProjectStandardService.getTermApprovalList(id);
         return Result.OK(page);
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermApproval.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
@@ -80,6 +81,7 @@ public class ProcessProjectStandardTermApproval {
     /**
      * 责任单位负责人id
      */
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
     @TableField(value = "responsible_unit_leader")
     @ApiModelProperty(value="责任单位负责人id")
     private String responsibleUnitLeader;
@@ -94,6 +96,7 @@ public class ProcessProjectStandardTermApproval {
     /**
      * 评估结果(1-符合、2-不符合、3-不涉及)
      */
+    @Dict(dicCode = "assess_results")
     @TableField(value = "assess_results")
     @ApiModelProperty(value="评估结果(1-符合、2-不符合、3-不涉及)")
     private String assessResults;
@@ -101,6 +104,7 @@ public class ProcessProjectStandardTermApproval {
     /**
      * 是否立项
      */
+    @Dict(dicCode = "yn")
     @TableField(value = "project_approval_flag")
     @ApiModelProperty(value="是否立项")
     private String projectApprovalFlag;

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java

@@ -852,4 +852,10 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         }
         return pageList;
     }
+
+    public List<ProcessProjectStandardTermApproval> getTermApprovalList(String id) {
+        LambdaQueryWrapper<ProcessProjectStandardTermApproval> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(ProcessProjectStandardTermApproval::getTermId,id);
+        return termApprovalService.list(wrapper1);
+    }
 }