Przeglądaj źródła

修改协单助手的新增和修改

anderx 3 lat temu
rodzic
commit
7345cc1a5f

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

@@ -523,15 +523,9 @@
 	<if test="releaseStarts != null and publicEnd != null">
 	and a.release_start  BETWEEN #{releaseStarts} and #{publicEnd}
 	</if>
-	<if test="userName !=null">
-	and b.nickname like CONCAT('%',#{userName},'%')
-	</if>
 	<if test="status !=null">
 	and a.status = #{status}
 	</if>
-	<if test="clockIn !=null">
-	and a.clock_in = #{clockIn}
-	</if>
     <if test="type==2">
       ORDER BY a.create_time desc
     </if>
@@ -546,7 +540,7 @@
   </select>
   <select id="countPublicRelease" resultType="java.lang.Integer">
   select  count(*)
-	from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
+	from public_release a  left join admin c on a.aid =c.id
     <if test="type==2">
       left join department d on c.department_id =d.id
     </if>
@@ -595,25 +589,20 @@
 	<if test="releaseStarts != null and publicEnd != null">
 	and a.release_start  BETWEEN #{releaseStarts} and #{publicEnd}
 	</if>
-	<if test="userName !=null">
-	and b.nickname like CONCAT('%',#{userName},'%')
-	</if>
+
 	<if test="status !=null">
 	and a.status = #{status}
 	</if>
-	<if test="clockIn !=null">
-	and a.clock_in = #{clockIn}
-	</if>
   </select>
 
   <select id="selectDtails" resultType="com.goafanti.weChat.bo.OutPublicRelease">
-    select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.district_name districtName,a.update_time updateTime,a.user_names userNames,
+    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.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid,
-    a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
+    a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.aid ,c.superior_id suprId,
+    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
-    from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
+    from public_release a  left join admin c on a.aid =c.id
     left join (select prid ,GROUP_CONCAT(uid)uids from public_release_details where prid= #{id} group by prid)x on a.id=x.prid
     left join t_order_new d on a.order_no=d.order_no
     where 1=1

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

@@ -497,6 +497,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setStatus(status);
 				np.setAid(null);
 				publicReleaseMapper.updateByPrimaryKeySelective(np);
+				updatePublicReleaseDtails(use,np.getId());
 				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
 				PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
 				publicReleaseLogMapper.insertSelective(log);
@@ -520,6 +521,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setMainId(use.getId());
 				np.setId(null);
 				publicReleaseMapper.insertSelective(np);
+				//补充客户表
+				addpublicReleaseDtails(use,np.getId());
 				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(use.getUserNames()).append("]。");
 				PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
 				sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
@@ -528,6 +531,49 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 	}
 
+	private void updatePublicReleaseDtails(PublicRelease use, Integer id) {
+		List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPCid(use.getId());
+		List<OutPublicReleaseDetails> list2 = publicReleaseDetailsMapper.selectByPCid(id);
+		//查找新增的
+		for (OutPublicReleaseDetails out : list) {
+			boolean flag=true;
+			for (OutPublicReleaseDetails out2 : list2) {
+				if (out.getUid().equals(out2.getUid())){
+					flag=false;
+				}
+			}
+			if (flag){
+				OutPublicReleaseDetails prd=new OutPublicReleaseDetails();
+				BeanUtils.copyProperties(out,prd);
+				prd.setPrid(id);
+				publicReleaseDetailsMapper.insertSelective(prd);
+			}
+		}
+
+		for (OutPublicReleaseDetails out2 : list2) {
+			boolean flag=true;
+			for (OutPublicReleaseDetails out : list) {
+				if (out2.getUid().equals(out.getUid())){
+					flag=false;
+				}
+			}
+			if (flag){
+				publicReleaseDetailsMapper.deleteByPrimaryKey(out2.getId());
+			}
+		}
+
+	}
+
+	private void addpublicReleaseDtails(PublicRelease use, Integer id) {
+		List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPCid(use.getId());
+		for (OutPublicReleaseDetails out : list) {
+			OutPublicReleaseDetails prd=new OutPublicReleaseDetails();
+			BeanUtils.copyProperties(out,prd);
+			prd.setPrid(id);
+			publicReleaseDetailsMapper.insertSelective(prd);
+		}
+	}
+
 	/**
 	 * 处理技术助手
 	 * @param use
@@ -874,6 +920,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			newP.setAssist(3);
 			newP.setType(4);
 			publicReleaseMapper.insertSelective(newP);
+			addpublicReleaseDtails(p,newP.getId());
 		}else {
 			for (PublicRelease pr : list) {
 				if (pr.getAid().equals(aid)){
@@ -882,6 +929,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					newP.setAssistantAid(pr.getAssistantAid());
 					newP.setAssistantName(pr.getAssistantName());
 					publicReleaseMapper.updateByPrimaryKeySelective(newP);
+					updatePublicReleaseDtails(p,newP.getId());
 				}
 
 			}