Browse Source

审核接口开发

anderx 3 years ago
parent
commit
3a1f95232e

+ 6 - 1
src/main/java/com/goafanti/common/dao/TaskSoptLogMapper.java

@@ -1,6 +1,9 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TaskSoptLog;
+import com.goafanti.order.bo.TaskSoptLogBo;
+
+import java.util.List;
 
 public interface TaskSoptLogMapper {
     int deleteByPrimaryKey(Long id);
@@ -14,4 +17,6 @@ public interface TaskSoptLogMapper {
     int updateByPrimaryKeySelective(TaskSoptLog record);
 
     int updateByPrimaryKey(TaskSoptLog record);
-}
+
+    List<TaskSoptLogBo> selectListBySoptId(Integer taskSoptId);
+}

+ 13 - 5
src/main/java/com/goafanti/common/mapper/TaskSoptLogMapper.xml

@@ -13,19 +13,20 @@
     id, task_sopt_id, `status`, reason, create_by, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from task_sopt_log
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from task_sopt_log
     where id = #{id,jdbcType=BIGINT}
   </delete>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskSoptLog" useGeneratedKeys="true">
-    insert into task_sopt_log (task_sopt_id, `status`, reason, 
+    insert into task_sopt_log (task_sopt_id, `status`, reason,
       create_by, create_time)
-    values (#{taskSoptId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{reason,jdbcType=VARCHAR}, 
+    values (#{taskSoptId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{reason,jdbcType=VARCHAR},
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskSoptLog" useGeneratedKeys="true">
@@ -95,4 +96,11 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
-</mapper>
+
+  <select id="selectListBySoptId" resultType="com.goafanti.order.bo.TaskSoptLogBo">
+    select a.id ,a.task_sopt_id taskSoptId,a.status ,a.reason ,a.create_by createBy ,a.create_time createTime,
+           b.name createName,DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%S') createTimes
+    from task_sopt_log a left join admin b on a.create_by =b.id
+    where a.task_sopt_id = #{taskSoptId}
+  </select>
+</mapper>

+ 10 - 2
src/main/java/com/goafanti/order/bo/InputProjectSotp.java

@@ -7,8 +7,7 @@ import javax.validation.constraints.NotNull;
 
 public class InputProjectSotp {
 
-    @Param(name="编号")
-    @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
+
     private String ids;
     @Param(name="类型")
     @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
@@ -20,7 +19,16 @@ public class InputProjectSotp {
     @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
     private String annexUrl;
 
+    private Long soptId;
+
 
+    public Long getSoptId() {
+        return soptId;
+    }
+
+    public void setSoptId(Long soptId) {
+        this.soptId = soptId;
+    }
 
     public Integer getType() {
         return type;

+ 18 - 0
src/main/java/com/goafanti/order/bo/TaskSoptLogBo.java

@@ -3,4 +3,22 @@ package com.goafanti.order.bo;
 import com.goafanti.common.model.TaskSoptLog;
 
 public class TaskSoptLogBo extends TaskSoptLog {
+    private String createName;
+    private String createTimes;
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getCreateTimes() {
+        return createTimes;
+    }
+
+    public void setCreateTimes(String createTimes) {
+        this.createTimes = createTimes;
+    }
 }

+ 28 - 1
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -647,10 +647,33 @@ public class OrderProjectApiController extends CertifyApiController {
 					ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
 			return res;
 		}
+		if (in.getIds()==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"编号","编号"));
+			return res;
+		}
 		return res.data(orderProjectService.addProjectSotp( in));
 	}
 
 	/**
+	 * 项目暂停
+	 *
+	 */
+	@RequestMapping(value = "/updateProjectSotp" ,method = RequestMethod.POST)
+	public Result updateProjectSotp(@Validated InputProjectSotp in,BindingResult bindingResult){
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
+			return res;
+		}
+		if (in.getSoptId()==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"暂停编号","暂停编号"));
+			return res;
+		}
+		return res.data(orderProjectService.updateProjectSotp( in));
+	}
+
+	/**
 	 * 项目暂停审核
 	 *
 	 */
@@ -670,9 +693,13 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 项目暂停日志列表
 	 *
 	 */
-	@RequestMapping(value = "/projectSotpList" ,method = RequestMethod.POST)
+	@RequestMapping(value = "/projectSotpList" ,method = RequestMethod.GET)
 	public Result projectSotpList(Integer taskSoptId){
 		Result res = new Result();
+		if (taskSoptId==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"项目暂停编号","项目暂停编号"));
+			return res;
+		}
 		return res.data(orderProjectService.projectSotpList( taskSoptId));
 	}
 

+ 3 - 0
src/main/java/com/goafanti/order/enums/NewProjectStatus.java

@@ -16,6 +16,8 @@ import java.util.Map;
  *	0-4 19-20(4已提交=公示) 11-12
  *	会员
  *	0-3 21第1年进行中 22第1年服务完成 23第2年进行中 24第2年服务完成 25第3年进行中 26第3年服务完成 27所有会员服务全部完成 11-12
+ *	通用
+ *	28 暂停
  * @author Administrator
  *
  */
@@ -29,6 +31,7 @@ public enum NewProjectStatus {
 	YWCXZ(19,"已完成(下证)"),YBH(20,"已驳回"),
 	D1NJX(21,"第1年进行中"),D1NWC(22,"第1年服务完成"),D2NJX(23,"第2年进行中"),D2NWC(24,"第2年服务完成"),D3NJX(25,"第3年进行中"),D3NWC(26,"第3年服务完成"),
 	QBWC(27,"所有会员服务全部完成"),
+	ZT(28,"暂停"),
 	INVALID(99,"未知");
 
 

+ 5 - 1
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -137,7 +137,9 @@ public interface OrderProjectService {
 
     void updateMidServiceProject(String orderNo);
 
-	Integer addProjectSotp(InputProjectSotp in);
+
+    Integer addProjectSotp(InputProjectSotp in);
+	Integer updateProjectSotp(InputProjectSotp in);
 
 	Pagination<?> selectProjectSotp(String orderNo, String userName, String depId, String contractNo, String projectName,
 							 Integer status,String startTime,String endTime,String receiverId, Integer pageNo, Integer pageSize);
@@ -145,4 +147,6 @@ public interface OrderProjectService {
 	List<TaskSoptLogBo> projectSotpList(Integer taskSoptId);
 
 	Object pushExamineProjectSotp(InputTaskSoptLog in);
+
+
 }

+ 28 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1488,6 +1488,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 	@Override
+	public Integer updateProjectSotp(InputProjectSotp in) {
+		TaskSopt use = taskSoptMapper.selectByPrimaryKey(in.getSoptId());
+		Date date = new Date();
+		String adminId = TokenManager.getAdminId();
+		TaskSopt taskSopt = new TaskSopt();
+		taskSopt.setId(in.getSoptId());
+		taskSopt.setType(in.getType());
+		taskSopt.setStatus(0);
+		taskSopt.setReason(in.getReason());
+		taskSopt.setAnnexUrl(in.getAnnexUrl());
+		taskSoptMapper.updateByPrimaryKeySelective(taskSopt);
+		TaskSoptLog log = new TaskSoptLog();
+		log.setTaskSoptId(taskSopt.getId());
+		log.setReason(in.getReason());
+		log.setCreateBy(adminId);
+		log.setCreateTime(date);
+		taskSoptLogMapper.insertSelective(log);
+		asyncUtils.addProjectSotpNotic(0, in.getType(),use.getTid().toString(),null);
+		return 1;
+	}
+
+	@Override
 	public Pagination<?> selectProjectSotp(String orderNo, String userName, String depId, String contractNo, String projectName,
 										   Integer status,String startTime,String endTime,String receiverId, Integer pageNo, Integer pageSize) {
 		Map<String,Object>params =new HashMap<>();
@@ -1516,7 +1538,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@Override
 	public List<TaskSoptLogBo> projectSotpList(Integer taskSoptId) {
-		return null;
+		List<TaskSoptLogBo> list =taskSoptLogMapper.selectListBySoptId(taskSoptId);
+		return list;
 	}
 
 	@Override
@@ -1543,6 +1566,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			taskLog.setContent(str.toString());
 			taskLog.setAid(use.getCreateBy());
 			taskLogMapper.insertSelective(taskLog);
+			TOrderTask task2 =new TOrderTask();
+			task2.setId(task.getId());
+			task2.setProjectStatus(NewProjectStatus.ZT.getCode());
+			tOrderTaskMapper.updateByPrimaryKeySelective(task2);
 		}else if(in.getStatus()==2) {
 			t.setStatus(2);
 		}