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