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

我的协单公出列表显示BUG修复

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

+ 1 - 0
src/main/java/com/goafanti/common/dao/PublicReleaseDetailsMapper.java

@@ -29,4 +29,5 @@ public interface PublicReleaseDetailsMapper {
 
     void updateDistrictByPrid(InputPublicRelease in);
 
+    String selectUserAdminByPrid(Integer id);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/PublicReleaseDetailsMapper.xml

@@ -216,6 +216,13 @@
         from public_release_details a left join user b on a.uid=b.id
         where prid = #{id,jdbcType=INTEGER} and uid =#{uid}
     </select>
+    <select id="selectUserAdminByPrid" resultType="java.lang.String">
+        select
+            GROUP_CONCAT(DISTINCT c.name)name
+        from public_release_details a left join user b on a.uid=b.id
+                                      left join admin c on b.aid =c.id
+        where a.prid = #{id}
+    </select>
 
     <update id="updateDistrictByPrid">
         update public_release_details

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

@@ -375,18 +375,14 @@
         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,
-        <if test="type== 0 or type==4 or type==5">
-        ad.name userAdminName,
-        </if>
+        a.clock_in clockIn,
         a.tech_start_process techStartProcess
         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== 0  or type==4 or type==5 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 admin ad on e.aid=ad.id
         </if>

+ 1 - 1
src/main/java/com/goafanti/weChat/bo/InputPublicReleaseList.java

@@ -10,7 +10,7 @@ public class InputPublicReleaseList {
 	private Integer type;
 	private String clockTime;
 	/**
-	 *  assist 字段意思0非协单 1主协单 2子协单
+	 *  assist 字段意思0非协单 1主协单 2子协单 3协单租售
 	 *  此处 0是 非+主  1是所有 2是子协单
 	 */
 	private Integer assist;

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

@@ -717,7 +717,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
 							if(ap.getType()==1)str=str.append(ap.getReviewerName()+",");
 						}
-
 						if(str.length()>1)e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
 					}else {
 						if (((e.getPublicType()==0||e.getPublicType()==2)
@@ -728,9 +727,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 								if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
 							}
 							e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
-
 						}else {
-							e.setAdminExamine(e.getUserAdminName()+" 未审核");
+							String s = publicReleaseDetailsMapper.selectUserAdminByPrid(e.getId());
+							e.setAdminExamine(s+" 未审核");
 						}
 					}
 				}else if (e.getStatus()==0) {