Просмотр исходного кода

公出详情判定当前审核逻辑修改

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

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

@@ -483,7 +483,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,
-        a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.aid ,c.superior_id suprId,
+        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,
         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,
         a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain,x.uids,a.public_type publicType

+ 3 - 2
src/main/java/com/goafanti/weChat/bo/OutPublicRelease.java

@@ -3,7 +3,6 @@ package com.goafanti.weChat.bo;
 import com.goafanti.common.model.PublicExamine;
 import com.goafanti.common.model.PublicRelease;
 
-import java.util.Date;
 import java.util.List;
 
 public class OutPublicRelease extends PublicRelease {
@@ -21,7 +20,9 @@ public class OutPublicRelease extends PublicRelease {
 	private String suprId;
 	/** 审核权限*/
 	private Integer permission;
-	/** 自己是否审核 */
+	/** 自己是否审核
+	 *   0=自己  1不是自己
+	 * */
 	private Integer myExamine;
 
 	private String reviewer;

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

@@ -553,7 +553,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public Pagination<OutPublicReleaseList> listPublicRelease(InputPublicReleaseList in) {
 		Map<String,Object> map =new HashMap<String, Object>();
 		map.put("type", in.getType()==null?0:in.getType());
-//		map.put("type", 5);
+		//先修改他人公出做测试
+ 		if(in.getType()==4)map.put("type", 5);
 		if (in.getType()==3) {
 			in.setAssist(2);
 			if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR))map.put("aid",TokenManager.getAdminId());
@@ -1103,13 +1104,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
 				flag=true;
 			}
+			TOrderNew tOrderNew=null;
 			if(flag){
 				//技术发起审核可以看
 				if (out.getTechStartProcess()!=0){
-					TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(out.getOrderNo());
+					tOrderNew = tOrderNewMapper.selectByPrimaryKey(out.getOrderNo());
 					if (tOrderNew.getSalesmanId().equals(aid)){
 						flag=false;
-						out.setPermission(0);
+						out.setMyExamine(0);
 					}
 				}
 			}