anderx 1 год назад
Родитель
Сommit
c238278c3b

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

@@ -211,7 +211,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 公出审核、外出审核 客户归属人
 	 */
 	@RequestMapping(value = "/marketersExamine", method = RequestMethod.POST)
-	public Result marketersExamine(Integer id ,Integer status,String remarks){
+	public Result marketersExamine(Integer id ,Integer status,String remarks,Integer evaluateType){
 		Result res =new Result();
 		if (id==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"公出编号"));
@@ -225,7 +225,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("备注长度不能超过20个字符。"));
 			return res;
 		}
-		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,1,0));
+		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,1, evaluateType));
 		return res;
 	}
 
@@ -234,7 +234,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 公出审核、外出审核 协单审核
 	 */
 	@RequestMapping(value = "/assistExamine", method = RequestMethod.POST)
-	public Result assistExamine(Integer id ,Integer status,String remarks){
+	public Result assistExamine(Integer id ,Integer status,String remarks,Integer evaluateType){
 		Result res =new Result();
 		if (id==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"公出编号"));
@@ -248,7 +248,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("备注长度不能超过20个字符。"));
 			return res;
 		}
-		res.setData(publicReleaseService.updateAssistExamine(id,status,remarks));
+		res.setData(publicReleaseService.updateAssistExamine(id,status,remarks,evaluateType));
 		return res;
 	}
 
@@ -257,7 +257,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 技术公出审核 公出他人企业
 	 */
 	@RequestMapping(value = "/techExamine", method = RequestMethod.POST)
-	public Result techExamine(Integer id ,Integer status,String remarks){
+	public Result techExamine(Integer id ,Integer status,String remarks,Integer evaluateType){
 		Result res =new Result();
 		if (id==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"公出编号"));
@@ -271,7 +271,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("备注长度不能超过20个字符。"));
 			return res;
 		}
-		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,2,0));
+		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,2,evaluateType));
 		return res;
 	}
 

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

@@ -77,7 +77,7 @@ public interface PublicReleaseService {
 
 	Object releaseAndExpenseCountClear();
 
-	Object updateAssistExamine(Integer id, Integer status, String remarks);
+	Object updateAssistExamine(Integer id, Integer status, String remarks,Integer evaluateType);
 
 	Object assistUnaudited();
 

+ 5 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1055,7 +1055,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 
 	@Override
-	public Object updateAssistExamine(Integer id, Integer status, String remarks) {
+	public Object updateAssistExamine(Integer id, Integer status, String remarks,Integer evaluateType) {
 		PublicRelease use = publicReleaseMapper.queryById(id);
 		if (use.getAssistProcess()!=2){
 			throw new BusinessException("该公出不是待协单审核的公出。");
@@ -1106,6 +1106,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				newPublic2.setStatus(1);
 				publicReleaseMapper.update(newPublic2);
 			}
+			if (evaluateType==1){
+				List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(id);
+				addUserSuperEvaluate(remarks, outPublicReleaseDetails, new Date());
+			}
 		}
 
 		return 1;