审核修改

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java

@@ -5,6 +5,8 @@ public class TaskSelectConstant {
      * 创建人 create
      */
     public static final String CREATE = "create";
+
+
     /**
      * 用户 user
      */

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java

@@ -50,7 +50,7 @@ public class CoscoEvaluateTaskController extends BaseController {
     public BaseResponse<IPage<TaskPageVo>> getTaskPage(@ApiParam(value = "对象数据", required = true)
                                                                 @RequestBody TaskPageVo taskListVo) {
         if(taskListVo.getSelectBy().equals(TaskSelectConstant.CREATE)){
-            taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId());
+            //taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId());
         }else if(taskListVo.getSelectBy().equals(TaskSelectConstant.USER)){
             taskListVo.setUserId(TokenUtil.getCurrentUser().getUserId());
         }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java

@@ -379,7 +379,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJYSH)
     public ApproveVo evaluateApprove(AddCoscoEvaluateTaskVo vo) {
         //根据工作流id查询任务信息
-        CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId());
+        CoscoEvaluateTask coscoEvaluateTask =
+                coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId());
         coscoEvaluateTask.setApproveStatus(vo.getApproveStatus());
         coscoEvaluateTask.setStatus(null);
         //修改任务信息

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java

@@ -74,6 +74,8 @@ public class TaskPageVo implements Serializable {
      */
     private String categoryPathName;
 
+    private String workFlowId;
+
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
 

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml

@@ -168,7 +168,7 @@
                cet.update_time,
                cete.template_name,
                cet.approve_status,
-               cet.work_flow_id
+               cet.work_flow_id,
             cet.last_update_time
         from cosco_evaluate_task cet
                  left join cosco_evaluate_template cete on cete.id = cet.template_id
@@ -338,6 +338,9 @@
             <if test="approveStatus != null">approve_status =
                 #{approveStatus},
             </if>
+            <if test="workFlowId != null">work_flow_id =
+                #{workFlowId},
+            </if>
         </trim>
         where id = #{id}
     </update>
@@ -370,12 +373,14 @@
                '单位'                                    as tenantName,
                cet.start_time                            as startTime,
                cet.end_time                              as endTime,
+               cet.work_flow_id as workFlowId,
                cet.status,
                cet.category_id                           as categoryId,
                cet.category_path_name                    as categoryPathName,
                cet.category_name                         as categoryName,
                cet.dept_id                               as deptId,
                cet.approve_status                        as approveStatus,
+
                case
                    when cet.approve_status = 0 then '审批中'
                    when cet.approve_status = 1 then '通过'
@@ -386,7 +391,8 @@
                    when cet.status = 1 then '评价中'
                    when cet.status = 2 then '已结束' end as statusName
         from cosco_evaluate_task cet
-                 left join cosco_evaluate_task_supplier_user cetsu on cet.id = cetsu.evaluate_task_id
+                 left join cosco_evaluate_task_supplier_user cetsu
+                     on cet.id = cetsu.evaluate_task_id
     </sql>
 
     <select id="selectTaskPage" parameterType="map"