Browse Source

审核列表判定修改

anderx 1 year ago
parent
commit
82ff853333

+ 2 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -717,6 +717,7 @@
             and a.public_type in (0,2)
             and a.assist in(0,1)
             and a.tech_start_process in (0,2)
+            and a.assist_process in (0,1)
             and apr.reviewer_id = #{aid} and apr.type=0
         </if>
         <if test="type==2">
@@ -788,7 +789,7 @@
 
     <select id="selectDtails" resultType="com.goafanti.weChat.bo.OutPublicRelease">
         select  a.id,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.update_time updateTime,a.user_names userNames,
-        date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
+        date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,a.assist_process assistProcess,
         a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.aid ,c.superior_id suprId,a.tech_start_process techStartProcess,
         a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,a.address_name addressName,
         date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus,a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1540,7 +1540,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				PublicRelease pr=new PublicRelease();
 				pr.setId(e.getId());
 				pr.setPublicType(0);
-				publicReleaseMapper.updateByPrimaryKeySelective(pr);
+				publicReleaseMapper.update(pr);
 				Admin sendAdmin=adminMapper.selectByPrimaryKey(admin.getReviewer());
 				noticeAid=sendAdmin.getId();
 				logStatus=2;

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -101,7 +101,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     public Integer add(InputExpenseAccount in) {
         //如果关联公出,获取公出信息
         if (in.getPrid()!=null){
-            PublicRelease pr = publicReleaseMapper.selectByPrimaryKey(in.getPrid());
+            PublicRelease pr = publicReleaseMapper.queryById(in.getPrid());
             in.setReleaseStart(pr.getReleaseStart());
             in.setReleaseEnd(pr.getReleaseEnd());
             in.setDistrictName(pr.getDistrictName());

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

@@ -65,10 +65,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("请让管理员先设置公出审核人。"));
 			return res;
 		}
-//		if (publicReleaseService.checkUserArchives(in)){
-//			res.getError().add(buildError("请先填写完成客户档案。"));
-//			return res;
-//		}
 
 		res.setData(publicReleaseService.addPublicRelease(in));
 		return res;

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

@@ -181,6 +181,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		updateName.setUserNames(userNames);
 		publicReleaseMapper.update(updateName);
 		addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
+		pushPublicCarbonCopy(in, my, userNames);
+		return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
+	}
+
+	private void pushPublicCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
 		if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
 			String startTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseStart());
 			String endTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseEnd());
@@ -189,24 +194,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			if(in.getType()==0)typeName="业务公出";
 			else if(in.getType()==1)typeName="技术公出";
 			else if(in.getType()==2)typeName="行政公出";
-			String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
+			String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!", my.getName(),
 					startTime,
 					endTime,
 					userNames);
-			asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(),my.getPublicCarbonCopy()
+			asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(), my.getPublicCarbonCopy()
 					,str2);
-			asyncUtils.sendWeChat(my.getPublicCarbonCopy(),in.getId(),
+			asyncUtils.sendWeChat(my.getPublicCarbonCopy(), in.getId(),
 					my.getName(), startTime,
 					endTime,
 					typeName,
 					in.getPlan());
 		}
-        return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
 	}
 
 
-
-
 	private void addPublicExamine(Integer id, String aid) {
 		Admin admin = adminMapper.selectByPrimaryKey(aid);
 		addPublicExamine(id,admin);
@@ -838,8 +840,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				addpublicLog(id, status, remarks);
 				//如果是协单公出主公出,在审核通过
 				if (use.getAssist()==1){
-					int newStatus = pushPublicReleaseAssist(use, status, date, a);
-					p.setStatus(newStatus);
+					pushPublicReleaseAssist(use, p, date, a);
+
 				}else if (use.getAssist()==0){
 					publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
 				}
@@ -996,6 +998,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			newPublic2.setId(mianUse.getId());
 			newPublic2.setStatus(2);
 			publicReleaseMapper.update(newPublic2);
+			addpublicLog(mianUse.getId(), status, remarks);
 		}
 		sendNoticeAndSoucket(mianUse.getAid(),status,content.toString());
 		return 1;
@@ -1158,16 +1161,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param date 时间
 	 * @param a
 	 */
-	private int pushPublicReleaseAssist(PublicRelease use,Integer status,Date date,Admin a) {
-		int newStatus=0;
+	private void pushPublicReleaseAssist(PublicRelease use,PublicRelease update,Date date,Admin a) {
 		if (use.getAssistAid()!=null){
-			newStatus=updatePushassist(use, status, date,a);
+			updatePushassist(use, update, date,a);
 			if(use.getAssistantAid()!=null){
 				updatepushAssistant(use,a);
 			}
 
 		}
-		return newStatus;
 	}
 
 	/**
@@ -1176,9 +1177,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param status
 	 * @param date
 	 */
-	private Integer updatePushassist(PublicRelease use, Integer status, Date date, Admin a) {
-		//营销协单公出需要协单审核完成才能公出所以需返回最新状态
-		int newStatus = status;
+	private void updatePushassist(PublicRelease use, PublicRelease updatePR, Date date, Admin a) {
+
 		//协单
 		List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),3,null);
 		String []ss= use.getAssistAid().split(",");
@@ -1268,11 +1268,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 		}
 		if(count==newList.size()){
-			newStatus = 2;
+			updatePR.setStatus(2);
+			updatePR.setAssistProcess(4);
 		}else {
-			newStatus = 1;
+			updatePR.setStatus(1);
+			updatePR.setAssistProcess(2);
 		}
-		return newStatus;
 	}
 
 	/**
@@ -1514,7 +1515,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		OutPublicRelease out=publicReleaseMapper.selectDtails(id);
 		List<PublicExamine> ps = publicExamineMapper.selectByPrid(out.getId());
 		out.setPeList(ps);
-
 		List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
 		if(out!=null){
 			//默认可以看