Browse Source

公出汇总列表修改

anderx 3 years ago
parent
commit
702cde9dc4

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

@@ -21,4 +21,5 @@ public interface PublicReleaseDetailsMapper {
 
     void insertBatch(List<PublicReleaseDetails> list);
 
+    String getNamesByPrid(Integer id);
 }

+ 8 - 2
src/main/java/com/goafanti/common/mapper/PublicReleaseDetailsMapper.xml

@@ -101,12 +101,11 @@
 
   <select id="selectByPCid" resultType="com.goafanti.common.model.PublicReleaseDetails">
     select
-      prid, `uid`, ufid, new_user newUser, sign_sum signSum
+      id,prid, `uid`, ufid, new_user newUser, sign_sum signSum
     from public_release_details
     where prid = #{id,jdbcType=INTEGER}
   </select>
 
-
   <insert id="insertBatch">
     insert into public_release_details (prid, `uid`, ufid,
                                         new_user, sign_sum)
@@ -116,4 +115,11 @@
       #{prd.newUser,jdbcType=INTEGER}, #{prd.signSum,jdbcType=INTEGER})
     </foreach>
   </insert>
+
+  <select id="getNamesByPrid" resultType="java.lang.String">
+    select  GROUP_CONCAT(b.nickname)userNames
+    from public_release_details a left join user b on a.uid =b.id
+    where prid = #{id}
+    group by prid
+  </select>
 </mapper>

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

@@ -263,8 +263,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 			NewExcelUtil<OutPublicDtailsFinance>excel=new NewExcelUtil<>(OutPublicDtailsFinance.class);
 			return  excel.exportExcel(list,"公出详细列表",uploadPath);
 		}
-
-
 		return null;
 	}
 

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

@@ -193,15 +193,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			e.printStackTrace();
 			throw new BusinessException("转换异常");
 		}
-		String str=null;
+
 		if (in.getUids()!=null){
 			List<String> split = Arrays.asList(in.getUids().split(","));
 			List<PublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPCid(in.getId());
-			str=addPRD(split,prList);
+			addPRD(split,prList);
 			deletePRD(split,prList);
 		}
+		String userNames=publicReleaseDetailsMapper.getNamesByPrid(in.getId());
 		PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),null,in.getReason(),date);
-
+		in.setUserNames(userNames);
 		if(in.getStatus()==null||in.getStatus()!=3) {
 			in.setStatus(1);
 			log.setStatus(PublicReleaseLog.states.xg.getCode());
@@ -209,7 +210,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 			//新增修改日志
 			//重新发起
-			addPublicReleaseLog(my,in,str,date);
+			addPublicReleaseLog(my,in,in.getUserNames(),date);
 		}else {
 			List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
 			List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
@@ -245,8 +246,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 	}
 
-	private String  addPRD(List<String> split, List<PublicReleaseDetails> prdList) {
-		StringBuffer str=new StringBuffer();
+	private void  addPRD(List<String> split, List<PublicReleaseDetails> prdList) {
 		List<PublicReleaseDetails> addPrdList=new ArrayList<>();
 		for (String s : split) {
 			boolean flag=true;
@@ -260,7 +260,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			if (flag){
 				PublicReleaseDetails prd=new PublicReleaseDetails();
 				User u=userMapper.selectByPrimaryKey(s);
-				str.append(u.getNickname()).append(",");
 				if (u!=null&&u.getShareType()==2){
 					prd.setNewUser(1);
 				}else {
@@ -273,7 +272,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 		}
 		if (!addPrdList.isEmpty())publicReleaseDetailsMapper.insertBatch(addPrdList);
-		return str.substring(0,str.length()-1);
 	}
 
 	@SuppressWarnings("unchecked")