Explorar o código

新增公出营销员和技术他人公出列表修改

anderx hai 1 ano
pai
achega
74570a947c

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

@@ -375,16 +375,17 @@
         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,
-        ea.total_amount expenseAmount ,a.clock_in clockIn,c2.name reviewerName,a.tech_start_process techStartProcess
+        ea.total_amount expenseAmount ,a.clock_in clockIn,c2.name reviewerName,a.tech_start_process techStartProcess,
+        ad.name userAdminName
         from public_release a  left join admin c on a.aid =c.id
         left join admin c2 on c.reviewer=c2.id
         left join expense_account ea ON a.id = ea.prid AND ea.status IN (0, 1, 2, 3)
         <if test="type==2">
             left join department d on c.department_id =d.id
         </if>
-        <if test="type==4 or userName !=null">
+        <if test="type==4 or type==5 or  userName !=null">
             left join public_release_details b on a.id=b.prid
-            left join user e on b.uid=e.id
+            left join user e on b.uid=e.id  left join admin ad on e.aid=ad.id
         </if>
         <if test="type==5">
             left join t_order_new ton on a.order_no =ton.order_no

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

@@ -30,6 +30,7 @@ public class OutPublicReleaseList {
 	private String assistantName;
 	private String userNames;
 	private String adminExamine;
+	private String userAdminName;
 	private Integer publicAgain;
 	private Integer publicType;
 	private Integer techStartProcess;
@@ -37,7 +38,13 @@ public class OutPublicReleaseList {
 
 	private List<OutPublicReleaseDetails> prdList;
 
+	public String getUserAdminName() {
+		return userAdminName;
+	}
 
+	public void setUserAdminName(String userAdminName) {
+		this.userAdminName = userAdminName;
+	}
 
 	public Integer getTechStartProcess() {
 		return techStartProcess;

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

@@ -692,7 +692,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getClockIn()!=null)	map.put("clockIn", in.getClockIn());
 		map.put("assist",in.getAssist()==null?0:in.getAssist());
 		Pagination<OutPublicReleaseList> p=(Pagination<OutPublicReleaseList>) findPage("listPublicRelease", "countPublicRelease", map, in.getPageNo(), in.getPageSize());
-		if(in.getType()==0||in.getType()==4){
+		if(in.getType()==0||in.getType()==4||in.getType()==5){
 			pushExamines(p);
 
 
@@ -710,7 +710,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				if (e.getStatus()==1&&
 						((e.getPublicType()==0||e.getPublicType()==2)&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
 				){
-					e.setAdminExamine(e.getReviewerName()+" 未审核");
+					e.setAdminExamine(e.getUserAdminName()+" 未审核");
 				}else if (e.getStatus()==0) {
 					e.setAdminExamine("");
 				}else {