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

公出修改、撤销BUG修复

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

+ 14 - 15
src/main/java/com/goafanti/common/utils/WeChatUtils.java

@@ -16,8 +16,8 @@ import com.goafanti.common.error.BusinessException;
 
 @Component
 public class WeChatUtils {
-	
-	
+
+
 	@Value(value = "${wx.appId}")
 	private String appId;
 	@Value(value = "${wx.appSecret}")
@@ -26,7 +26,7 @@ public class WeChatUtils {
 	private String wxState;
 	@Autowired
 	private RedisUtil redisUtil;
-	
+
 	//待审核通知
 	private static final String sptz="j7WH3EwQnxGxwuV2HwmJhryxySPE8vOiV5cVOpp-42I";
 	//审核结通知
@@ -34,14 +34,13 @@ public class WeChatUtils {
 	private static  String send_url="https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=ACCESS_TOKEN";
 
 
-	
+
 
 	/**
-	 * 
+	 *
 	 * @param openid
 	 * @param type 状态 0驳回 1发起 2同意
-	 * @param string 
-	 * @param date 
+	 * @param date
 	 */
 	public Integer addNotice(String openid ,Integer type,Integer id, Date date, String aname,String remarks) {
 		Map<String, Object> map=new HashMap<String, Object>();
@@ -66,7 +65,7 @@ public class WeChatUtils {
 		}else {
 			return 1;
 		}
-		
+
 	}
 	private Map<String, Object> getData(Integer type,Date date, String aname, String remarks) {
 		Map<String, Object> we=new HashMap<String, Object>();
@@ -97,13 +96,13 @@ public class WeChatUtils {
 			Map<String, Object> v3=new HashMap<String, Object>();
 			v3.put("value", remarks);
 			we.put("thing6", v3);
-		} 
+		}
 		return we;
 	}
-	
-	
 
-	
+
+
+
 	public String getAccessToken() {
 		Date date = new Date();
 		if (redisUtil.presence("access_token")||redisUtil.presence("expires_in")) {
@@ -118,14 +117,14 @@ public class WeChatUtils {
 				redisUtil.deleteString("expires_in");
 				return setSessionAccessToken(date);
 			}
-		
+
 		} else {
 			return setSessionAccessToken(date);
 		}
-		
+
 
 	}
-	
+
 
 
 	private String setSessionAccessToken(Date date) {

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

@@ -102,7 +102,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param nickname	客户名称
 	 * @param date	时间
 	 */
-	private Map<String, Object> addPublicReleaseLog(AdminListBo my,InputPublicRelease in,Integer logStatus,String nickname,Date date ) {
+	private Map<String, Object> addPublicReleaseLog(AdminListBo my,PublicRelease in,Integer logStatus,String nickname,Date date ) {
 		Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
 		PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),logStatus,"发起外出申请",new Date());
 		publicReleaseLogMapper.insertSelective(log);
@@ -208,9 +208,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public Pagination<OutPublicReleaseList> listPublicRelease(InputPublicReleaseList in) {
 		Map<String,Object> map =new HashMap<String, Object>();
 		map.put("type", in.getType()==null?0:in.getType());
-		if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
+//		if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
 			map.put("aid", TokenManager.getAdminId());
-		}
+//		}
 		if (StringUtils.isNotEmpty(in.getClockTime()))	map.put("clockTime", in.getClockTime());
 		if(StringUtils.isNotEmpty(in.getReleaseStarts()))	map.put("releaseStarts", in.getReleaseStarts());
 		if(StringUtils.isNotEmpty(in.getReleaseEnds()))	map.put("publicEnd", in.getReleaseEnds()+" 23:59:59");
@@ -241,7 +241,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			str=str.append("同意,");
 			//如果是协单公出主公出,在审核通过
 			if (use.getAssist()==1){
-				pushPublicReleaseAssist(use);
+				pushPublicReleaseAssist(use,status,date);
 			}else if (use.getAssist()==0){
 				publicReleaseMapper.updateStatusByMainId(3,use.getId());
 			}
@@ -278,7 +278,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			return 1;
 	}
 
-	private void pushPublicReleaseAssist(PublicRelease use) {
+	private void pushPublicReleaseAssist(PublicRelease use,Integer status,Date date) {
 		Integer useId=use.getId();
 		if (use.getAssistAid()!=null){
 			List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId());
@@ -295,15 +295,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					PublicRelease in = new PublicRelease();
 					in.setId(out.getId());
 					in.setStatus(3);
-					publicReleaseMapper.updateByPrimaryKey(in);
-					PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单", new Date());
+					publicReleaseMapper.updateByPrimaryKeySelective(in);
+					PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单", date);
 					publicReleaseLogMapper.insertSelective(log);
 				}else {
 					use.setId(out.getId());
 					use.setAid(out.getAid());
+					use.setMainId(null);
+					use.setClockIn(null);
+					use.setClockInTime(null);
 					use.setAssist(2);
-					use.setStatus(2);
-					publicReleaseMapper.updateByPrimaryKey(use);
+					use.setStatus(status);
+					publicReleaseMapper.updateByPrimaryKeySelective(use);
+					PublicReleaseLog log = new PublicReleaseLog(out.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(), "修改协单信息", date);
+					publicReleaseLogMapper.insertSelective(log);
 				}
 			}
 			for (String s : ss) {
@@ -321,7 +326,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					use.setMainId(useId);
 					use.setId(null);
 					publicReleaseMapper.insert(use);
-					PublicReleaseLog log = new PublicReleaseLog(use.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), "公出协单通过产生公出信息", new Date());
+					PublicReleaseLog log = new PublicReleaseLog(use.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(), "修改协单信息", date);
 					publicReleaseLogMapper.insertSelective(log);
 				}
 			}