소스 검색

新增无限制公出审核列表开发

anderx 1 년 전
부모
커밋
218b26af3f

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

@@ -674,11 +674,14 @@
 
 
     <select id="listPublicRelease" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
-        select a.id ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.aid,a.public_type publicType,
+        select a.id ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.aid,a.public_type publicType,a.order_no orderNo,
         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.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
         a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
         a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames,a.alone,
+        <if test="type==7">
+            opc.max_process maxProcess,
+        </if>
         ea.total_amount expenseAmount ,a.clock_in clockIn,a.assist_process assistProcess,a.tech_start_process techStartProcess
         from public_release a  left join admin c on a.aid =c.id
         left join expense_account ea ON a.id = ea.prid AND ea.status IN (0, 1, 2, 3)

+ 16 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java

@@ -7,6 +7,7 @@ public class OutPublicReleaseList {
 
 	private Integer id;
 	private String nickname;
+	private String orderNo;
 	private String districtName;
 	private String aid;
 	private String aname;
@@ -33,6 +34,7 @@ public class OutPublicReleaseList {
 	private String userAdminName;
 	private Integer publicAgain;
 	private Integer publicType;
+	private Integer maxProcess;
 	private Integer techStartProcess;
 	private BigDecimal expenseAmount;
 
@@ -41,9 +43,23 @@ public class OutPublicReleaseList {
 	private Integer assistProcess;
 	private Integer alone;
 
+	public Integer getMaxProcess() {
+		return maxProcess;
+	}
+
+	public void setMaxProcess(Integer maxProcess) {
+		this.maxProcess = maxProcess;
+	}
 
 	private List<OutPublicReleaseDetails> prdList;
 
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
 
 	public Integer getAlone() {
 		return alone;

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

@@ -748,9 +748,10 @@ 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());
-		//先修改他人公出做测试
+
+		OutPublicConfig config=null;
 		if (in.getType()==7){
-			PublicConfig config=publicConfigMapper.queryById(1);
+			config=publicConfigMapper.selectDetails();
 			String aid=TokenManager.getAdminId();
 			int configType=9;
 			if (aid.equals(config.getTechAuditor())){
@@ -778,11 +779,30 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		map.put("assist",in.getAssist()==null?0:in.getAssist());
 		Pagination<OutPublicReleaseList> p=(Pagination<OutPublicReleaseList>) findPage("listPublicRelease", "countPublicRelease", map, in.getPageNo(), in.getPageSize());
 		//处理审核人
-		pushExamines(p);
-
+		if (in.getType()==7){
+			pushMaxExamines(p,config);
+		}else {
+			pushExamines(p);
+		}
 		return p;
 	}
 
+	private void pushMaxExamines(Pagination<OutPublicReleaseList> p,OutPublicConfig config) {
+		List<OutPublicReleaseList> list = (List<OutPublicReleaseList>) p.getList();
+		if (config==null)config=config=publicConfigMapper.selectDetails();
+		for (OutPublicReleaseList e : list) {
+			if (e.getOrderNo()!=null){
+				if (e.getMaxProcess()==1){
+					e.setAdminExamine(config.getTechAuditorName());
+				}else if (e.getMaxProcess()==2){
+					e.setAdminExamine(config.getFinanceAuditorName());
+				}else if (e.getMaxProcess()==3){
+					e.setAdminExamine(config.getOtherAuditorName());
+				}
+			}
+		}
+	}
+
 	private void pushExamines(Pagination<OutPublicReleaseList> p) {
 		List<OutPublicReleaseList> list = (List<OutPublicReleaseList>) p.getList();
 		if (!list.isEmpty()){