Browse Source

项目管理显示BUG修复

anderx 7 years ago
parent
commit
8b30640395

+ 1 - 0
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -31,6 +31,7 @@
 		<result column="founder" property="founder" jdbcType="VARCHAR" />
 		<result column="contract_id" property="contractId" jdbcType="VARCHAR" />
 		<result column="principal" property="principal" jdbcType="VARCHAR" />
+		<result column="publish_status" property="publishStatus" jdbcType="INTEGER" />
 	</resultMap>
 	<sql id="Base_Column_List">
 		id, uid, serial_number, contacts, department, dispatch_info,

+ 5 - 7
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -58,7 +58,7 @@ import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.service.UserService;
 
 @Controller
-@RequestMapping(value = "/open/api/admin/techproject")
+@RequestMapping(value = "/api/admin/techproject")
 public class AdminTechProjectApiController extends CertifyApiController {
 	@Value(value = "${aesSecretKey}")
 	private String					aesSecretKey	= null;
@@ -971,6 +971,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @param taskComment
 	 * @return
 	 */
+	@SuppressWarnings("null")
 	@RequestMapping(value = "/updatePublishStatus",method = RequestMethod.POST)
 	public Result updateProjectTask(String taskId,String publishStatus){
 		Result res = new Result();
@@ -979,13 +980,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 			return res;
 		}
 		ContractTask task = techProjectService.selectTaskById(taskId);
-		if (task.getTaskStatus()!=3) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "任务状态"));
-			return res;
-		}
 		if(task != null){
-			if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode())
-				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+			if(task.getTaskStatus() != TaskState.COMPLETE.getCode()){
+				res.getError().add(buildError( "任务状态","操作材料未完成"));
+			return res;}
 		}
 		task.setPublishStatus(Integer.valueOf(publishStatus));
 		techProjectService.updateProjectTask(task);