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

单位客户查询,新增excel多名称复制赛选。

anderx лет назад: 3
Родитель
Сommit
d407a13d59

+ 1 - 3
src/main/java/com/goafanti/common/dao/PublicReleaseLogMapper.java

@@ -53,7 +53,5 @@ public interface PublicReleaseLogMapper {
 
 	List<outPublicReleaseLog> listPublicReleaseLog(@Param ("id")Integer id,@Param ("ufid")String ufid);
 
-	void updateNoRead();
 
-	List<outPublicReleaseLog> unreadPublicReleaseLog(String aid);
-}
+}

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

@@ -467,7 +467,7 @@
 
 
   <select id="listPublicRelease" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
-  select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
+  select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,a.aid,
   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.latitude ,a.longitude ,a.clock_in clockIn,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.type
@@ -489,7 +489,9 @@ a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type
       and d.manager_id = #{aid}
     </if>
     <if test="type==3">
-      and a.aid= #{aid}
+        <if test="aid !=null">
+        and a.aid= #{aid}
+        </if>
       and a.type = #{type}
     </if>
 	<if test="clockTime !=null">
@@ -532,7 +534,9 @@ a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type
       and d.manager_id = #{aid}
     </if>
     <if test="type==3">
-      and a.aid= #{aid}
+      <if test="aid !=null">
+        and a.aid= #{aid}
+      </if>
       and a.type = #{type}
     </if>
 	<if test="clockTime !=null">

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

@@ -5,6 +5,7 @@ public class OutPublicReleaseList {
 	private String id;
 	private String nickname;
 	private String userName;
+	private String aid;
 	private String aname;
 	private String releaseStarts;
 	private String releaseEnds;
@@ -20,6 +21,14 @@ public class OutPublicReleaseList {
 	private String 	assistAid;
 	private String 	assistAidName;
 
+	public String getAid() {
+		return aid;
+	}
+
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
 	public Integer getType() {
 		return type;
 	}

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

@@ -84,7 +84,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if (u.getAid().equals(TokenManager.getAdminId())){
 			in.setMainStatus(1);
 		}
-		in.setAssistAidName(getAssistAidName(in.getAssistAid()));
+		if (in.getAssist()==1)in.setAssistAidName(getAssistAidName(in.getAssistAid()));
 		publicReleaseMapper.insertSelective(in);
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
@@ -165,10 +165,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			in.setStatus(1);
 			log.setStatus(PublicReleaseLog.states.xg.getCode());
 			in.setUpdateStatus(1);
+			if(in.getAssist()==1)in.setAssistAidName(getAssistAidName(in.getAssistAid()));
 		}else {
 			log.setStatus(PublicReleaseLog.states.cx.getCode());
+			List<OutPublicRelease> list = publicReleaseMapper.selectByMainId(in.getId());
+			for (OutPublicRelease out : list) {
+				PublicReleaseLog log2 = new PublicReleaseLog(out.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单", new Date());
+				publicReleaseLogMapper.insertSelective(log2);
+			}
+
+			publicReleaseMapper.updateStatusByMainId(3,in.getId());
 		}
-		in.setAssistAidName(getAssistAidName(in.getAssistAid()));
 
 		publicReleaseLogMapper.insertSelective(log);
 		return publicReleaseMapper.updateByPrimaryKeySelective(in);
@@ -350,7 +357,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			AdminListBo ab=adminMapper.getDeptNameByAid(out.getAid());
 			if (!TokenManager.getAdminId().equals( out.getAid())&&
 					!TokenManager.getAdminId().equals(out.getReviewer())&&
-					!TokenManager.getAdminId().equals(ab.getDepManager())){
+					!TokenManager.getAdminId().equals(ab.getDepManager())&&
+					!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
 				flag=true;
 			}
 			if(flag){
@@ -481,9 +489,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			throw new BusinessException("转换异常");
 		}
 		List<Integer> is=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
+		is.forEach(System.out::println);
+		System.out.println(in.getId());
 		if (is.size()>1) {
 			return true;
 		}else  if(is.size()==1){
+			System.out.println(is.get(0));
 			if (in.getId()!=null && !in.getId().equals(is.get(0))){
 				return true;
 			}

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20