Browse Source

小程序上级审核同步指导意见修改

anderx 1 year ago
parent
commit
1c1c407cc7

+ 4 - 4
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -189,7 +189,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 公出审核、外出审核 上级
 	 */
 	@RequestMapping(value = "/examinePublicRelease", method = RequestMethod.POST)
-	public Result examinePublicRelease(Integer id ,Integer status,String remarks){
+	public Result examinePublicRelease(Integer id ,Integer status,String remarks,Integer evaluateType){
 		Result res =new Result();
 		if (id==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"公出编号"));
@@ -203,7 +203,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("备注长度不能超过20个字符。"));
 			return res;
 		}
-		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,0));
+		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,0,evaluateType));
 		return res;
 	}
 
@@ -225,7 +225,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("备注长度不能超过20个字符。"));
 			return res;
 		}
-		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,1));
+		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,1,0));
 		return res;
 	}
 
@@ -271,7 +271,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("备注长度不能超过20个字符。"));
 			return res;
 		}
-		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,2));
+		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,2,0));
 		return res;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -13,7 +13,7 @@ public interface PublicReleaseService {
 
 
 
-	int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer type);
+	int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer type,Integer evaluateType);
 
 
 	List<outPublicReleaseLog> listPublicReleaseLog(Integer id,String ufid);

+ 6 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -858,11 +858,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param status 状态 0驳回 1发起 2同意 3 撤销 4技术驳回
 	 * @param remarks
 	 * @param examineType 0上级审核 1营销员审核 2技术审核
+	 * @param evaluateType 0不存指导意见 1存指导意见
 	 * @return
 	 */
 	@Override
 	@Transactional
-	public int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer examineType) {
+	public int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer examineType,Integer evaluateType) {
 		PublicRelease p=new PublicRelease();
 		Date date =new Date();
 		String aid=TokenManager.getAdminId();
@@ -921,7 +922,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			sendNoticeAndSoucket(a.getId(),status,content.toString());
 			List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(id);
 			//添加上级评价
-			addUserSuperEvaluate(remarks, outPublicReleaseDetails, date);
+			if (evaluateType==1){
+				addUserSuperEvaluate(remarks, outPublicReleaseDetails, date);
+			}
+
 			//营销员审核
 		}else if (examineType==1){
 			//通知公出人切换成公出人审核人