Commit 5cf86fcb by mayunfei

四川对外接口

parent 9736493a
...@@ -18,7 +18,7 @@ public class FilterConfig extends WebMvcConfigurerAdapter { ...@@ -18,7 +18,7 @@ public class FilterConfig extends WebMvcConfigurerAdapter {
// //
registry.addInterceptor(InterceptorConfig). registry.addInterceptor(InterceptorConfig).
addPathPatterns("/**"). addPathPatterns("/**").
excludePathPatterns("/refreshCodeCache","/loginFail","/login","/toGetZczlListYth","/queryAllzTreeData","/queryUnitCode","/queryTypeCode","/queryZTreeDataByName"); excludePathPatterns("/refreshCodeCache","/loginFail","/login","/toGetZczlListYth","/queryAllzTreeData","/queryUnitCode","/queryTypeCode","/queryZTreeDataByName","/getZczlListImp","/zczlQsImp");
} }
@Override @Override
......
...@@ -4532,6 +4532,450 @@ public class ZczlController { ...@@ -4532,6 +4532,450 @@ public class ZczlController {
/**
* 我负责的侦查指令
* @param identitycard
* @param tbYwZczl
* @param page
* @param rows
* @return
*/
@ResponseBody
@RequestMapping(value="/getZczlListImp")
public Map<String, Object> getZczlListImp(
@RequestParam(value = "identitycard", defaultValue = "") String identitycard
,TbYwZczl tbYwZczl
,@RequestParam(value = "page", defaultValue = "0") int page
,@RequestParam(value = "rows", defaultValue = "0") int rows){
//拿到登录用户
User user = zczlService.getUserByIdCard(identitycard);
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(page);
easyUIPage.setPagePara(rows);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
tbYwZczl.setBegin(begin);
tbYwZczl.setEnd(end);
//判断用户是否为联络员
boolean sflly = sflly(user);
List<TbYwZczl> tbYwZczlList = zczlService.toQueryAllWfzdzczl(tbYwZczl, user,sflly);
Integer totalCount = 0;
totalCount = zczlService.toQueryAllWfzdzczlForTotal(tbYwZczl, user,sflly);
if(tbYwZczlList!=null&&tbYwZczlList.size()>0){
//判断是否存在回报信息
for(int i=0;i<tbYwZczlList.size();i++){
TbYwZczl zczl = tbYwZczlList.get(i);
zczl.setSfczhbxx("0");//不存在回报信息
//拿到我负责的与我分派的侦查指令信息
List<TbYwZczlFp> fps = zczlService.getWfzdYwfpdZczlxx(user.getIdentitycard(),zczl.getZczlbh());
//遍历分派信息,拿到回报信息
if(fps!=null) {
for (int t = 0; t < fps.size(); t++) {
//根据分派编号拿到所有回报信息
List<TbYwZczlHb> hbxxs = zczlService.getAllHbxxByFpbh(fps.get(t).getFpbh());
if(hbxxs!=null&&hbxxs.size()>0){
zczl.setSfczhbxx("1");//存在回报信息
break;
}
}
}
}
//判断是否分派或分派个数
for(int i=0;i<tbYwZczlList.size();i++){
TbYwZczl zczl = tbYwZczlList.get(i);
//我分派的侦查指令
List<TbYwZczlFp> fps = zczlService.getWfpdFpxx(zczl.getZczlbh(),user.getIdentitycard());
if(fps!=null&&fps.size()>0){
zczl.setZlsffp("1");//1-已分派
zczl.setZlfpgs(fps.size());//指令分派个数
int zlqsgs = 0;//指令签收个数
int zlhbcs = 0;//指令回报个数
String zlfpdwHtml = "";//指令分派单位所用html
String fpdwHtml = "";//分派单位html
String qsztHtml = "";//签收状态html
String fpyqHtml = "";//分派要求html
List<String> fpbhs = new ArrayList<>();
for(int n=0;n<fps.size();n++){
String sfqspdbz = fps.get(n).getSfqspdbz();
String fpbh = fps.get(n).getFpbh();
String fpgzyq = fps.get(n).getFpgzyq();
fpbhs.add(fpbh);
//通过单位代码拿到单位名称
String qsrdwmc = zczlService.getUnitnameByUnitcode(fps.get(n).getQsrgajgdm());
fpdwHtml = "<tr><td><span style='width:100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;display: block;' title='"+qsrdwmc+"'>"+qsrdwmc+"</span></td>";
zlfpdwHtml = zlfpdwHtml+fpdwHtml;
Date fpsj = fps.get(n).getFpsj();//分派时间
long qssjc = getTimesByFpsj(fpsj);//签收时间差
//拿到签收个数
if("1".equals(sfqspdbz)){
zlqsgs++;
//判断签收是否超期
Date qssj = fps.get(n).getQssj();//签收时间
if(qssj.getTime()-fpsj.getTime()>qssjc){
qsztHtml = "<td style='color:red;'>超期签收</td>";//超期签收
}else{
qsztHtml = "<td style='color:green;'>已签收</td>";//已签收
}
}else{
//判断是否超期未签收
Date nowDate = new Date();//当前时间
if(nowDate.getTime()-fpsj.getTime()>qssjc){
qsztHtml = "<td style='color:red;'>超期未签收</td>";//超期签收
}else{
qsztHtml = "<td style='color:red;'>未签收</td>";//已签收
}
}
fpyqHtml = "<td><span style='width:100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;display: block;' title='"+fpgzyq+"'>"+fpgzyq+"</span></td></tr>";
zlfpdwHtml = zlfpdwHtml+qsztHtml+fpyqHtml;
}
//通过分派信息list拿到回报信息list
List<TbYwZczlHb> hbs = zczlService.getAllHbsByAllFps(fpbhs);
if(hbs!=null){
zlhbcs = hbs.size();
}
zczl.setZlqsgs(zlqsgs);
zczl.setZlhbcs(zlhbcs);
zczl.setZlfpdwHtml(zlfpdwHtml);
}else{
zczl.setZlsffp("0");//0-未分派
zczl.setZlfpgs(0);
}
}
//确定操作栏的按钮-能否签收;能否分派;能否回报;能否回报修改
if(sflly){
for(int i=0;i<tbYwZczlList.size();i++){
TbYwZczl zczl = tbYwZczlList.get(i);
//联络员可分派
zczl.setNffp("1");
String zczlbh = zczl.getZczlbh();
TbYwZczlFp fpxx = new TbYwZczlFp();
fpxx.setZczlbh(zczlbh);
fpxx.setQsrgmsfhm(user.getIdentitycard());
fpxx.setQsrgajgdm(user.getUnitcode());
fpxx.setSflly("1");
//拿到分派信息
TbYwZczlFp zczlFp = zczlService.getFpxxByTbYwZczlFp(fpxx);
String fpbh = null;
Date nowDate = new Date();//现在时间
Date hbqx = zczl.getHbqx_date();//回报期限
if(zczlFp!=null){
Date fpsj = zczlFp.getFpsj();//分派时间
Date qssj = zczlFp.getQssj();//签收时间
long qssjc = getTimesByFpsj(fpsj);//签收时间差
if("0".equals(zczlFp.getSfqspdbz())){
zczl.setNfqs("1");//能签收就不能分派
zczl.setNffp("0");
//未签收判断其是否超期未签收
//指令签收状态(0-未签收;1-超期未签收;2-已签收;3-超期签收;)
if(nowDate.getTime()-fpsj.getTime()>qssjc){
zczl.setZlqszt("1");//超期未签收
}else{
zczl.setZlqszt("0");//未签收
}
//是否超期未回报
//指令回报状态(0-未回报;1-超期未回报;2-已回报(评价等级);3-超期回报(评价等级);)
if(nowDate.getTime()>hbqx.getTime()+24*60*60*1000){
zczl.setZlhbzt("1");//超期未回报
}else{
zczl.setZlhbzt("0");//未回报
}
}else{
zczl.setNfqs("0");
//已签收--判断是否超期签收
if(qssj.getTime()-fpsj.getTime()>qssjc){
zczl.setZlqszt("3");//超期签收
}else{
zczl.setZlqszt("2");//已签收
}
}
fpbh = zczlFp.getFpbh();
zczl.setGzyq(zczlFp.getFpgzyq());
zczl.setFpbh(fpbh);
}
//已签收才去拿到回报信息,否则不能回报
if("0".equals(zczl.getNfqs())){
//通过分派编号拿到首次回报信息
TbYwZczlHb zczlHb = zczlService.getHbxxByFpbh(fpbh);
if(zczlHb!=null){
//已回报,判断其回报是否超期
Date hbsj = zczlHb.getHbsj_date();
//指令回报状态(0-未回报;1-超期未回报;2-已回报(评价等级);3-超期回报(评价等级);)
if(hbsj.getTime()>hbqx.getTime()+24*60*60*1000){
zczl.setZlhbzt("3");//超期回报
}else{
zczl.setZlhbzt("2");//已回报
}
zczl.setNfhb("0");
//判断是否能够回报修改
if(zczlHb.getPjdj()!=null&&!"".equals(zczlHb.getPjdj())){
zczl.setNfhbxg("0");//不能回报修改
zczl.setHbpjdj(zczlHb.getPjdj());//回报评价等级(0-不合格 1-合格 2-优秀)
if("0".equals(zczlHb.getPjdj())){//评价等级0-不合格
//通过分派编号查询所有续报信息
List<TbYwZczlHb> zczlHbxbList = zczlService.getXbxxByFpbh(fpbh);
//能进行续报 不存在续报信息 评价等级不为空且只存在评价等级为0的
//能进行续报修改 续报信息存在且存在评价等级为空的续报信息
if(zczlHbxbList==null||zczlHbxbList.size()==0){
zczl.setNfxb("1");
//未续报
zczl.setZlxbzt("0");//指令续报状态(0-未续报;1-已续报(续报评价等级))
}else{
zczl.setZlxbzt("1");//指令续报状态(0-未续报;1-已续报(续报评价等级))
String tempXb = "0";// 0-不能续报修改能续报 1-能续报修改不能续报 2-不能续报修改且不能续报
for(int t=0;t<zczlHbxbList.size();t++){
String pjdj = zczlHbxbList.get(t).getPjdj();
if(pjdj==null||"".equals(pjdj.trim())){
tempXb = "1";
break;
}else if("1".equals(pjdj)||"2".equals(pjdj)){
tempXb = "2";
zczl.setXbpjdj(pjdj);//续报报评价等级(0-不合格 1-合格 2-优秀)
break;
}
}
if("0".equals(tempXb)){
zczl.setNfxb("1");
zczl.setXbpjdj("0");//续报报评价等级(0-不合格 1-合格 2-优秀)
}else if("1".equals(tempXb)){
zczl.setNfxbxg("1");
}
}
}
}else{
//已回报未进行回报评价
zczl.setNfhbxg("1");
}
}else{
//不存在回报信息,判断未回报是否超期
zczl.setNfhb("1");
//指令回报状态(0-未回报;1-超期未回报;2-已回报(评价等级);3-超期回报(评价等级);)
if(nowDate.getTime()>hbqx.getTime()+24*60*60*1000){
zczl.setZlhbzt("1");//超期未回报
}else{
zczl.setZlhbzt("0");//未回报
}
}
}
tbYwZczlList.set(i, zczl);
}
}else{
for(int i=0;i<tbYwZczlList.size();i++){
TbYwZczl zczl = tbYwZczlList.get(i);
//非联络员不可分派
zczl.setNffp("0");
String zczlbh = zczl.getZczlbh();
TbYwZczlFp fpxx = new TbYwZczlFp();
fpxx.setZczlbh(zczlbh);
fpxx.setQsrgmsfhm(user.getIdentitycard());
fpxx.setSflly("0");
//拿到分派信息
TbYwZczlFp zczlFp = zczlService.getFpxxByTbYwZczlFp(fpxx);
String fpbh = null;
Date nowDate = new Date();//现在时间
Date hbqx = zczl.getHbqx_date();//回报期限
if(zczlFp!=null){
Date fpsj = zczlFp.getFpsj();//分派时间
Date qssj = zczlFp.getQssj();//签收时间
long qssjc = getTimesByFpsj(fpsj);//签收时间差
if("0".equals(zczlFp.getSfqspdbz())){
zczl.setNfqs("1");//能签收就不能分派
zczl.setNffp("0");
//未签收判断其是否超期未签收
//指令签收状态(0-未签收;1-超期未签收;2-已签收;3-超期签收;)
if(nowDate.getTime()-fpsj.getTime()>qssjc){
zczl.setZlqszt("1");//超期未签收
}else{
zczl.setZlqszt("0");//未签收
}
//是否超期未回报
//指令回报状态(0-未回报;1-超期未回报;2-已回报(评价等级);3-超期回报(评价等级);)
if(nowDate.getTime()>hbqx.getTime()+24*60*60*1000){
zczl.setZlhbzt("1");//超期未回报
}else{
zczl.setZlhbzt("0");//未回报
}
}else{
zczl.setNfqs("0");
//已签收--判断是否超期签收
if(qssj.getTime()-fpsj.getTime()>qssjc){
zczl.setZlqszt("3");//超期签收
}else{
zczl.setZlqszt("2");//已签收
}
}
fpbh = zczlFp.getFpbh();
zczl.setGzyq(zczlFp.getFpgzyq());
zczl.setFpbh(fpbh);
}
//已签收才去拿到回报信息,否则不能回报
if("0".equals(zczl.getNfqs())){
//通过分派编号拿到回报信息
TbYwZczlHb zczlHb = zczlService.getHbxxByFpbh(fpbh);
if(zczlHb!=null){
zczl.setNfhb("0");
//已回报,判断其回报是否超期
Date hbsj = zczlHb.getHbsj_date();
//指令回报状态(0-未回报;1-超期未回报;2-已回报(评价等级);3-超期回报(评价等级);)
if(hbsj.getTime()>hbqx.getTime()+24*60*60*1000){
zczl.setZlhbzt("3");//超期回报
}else{
zczl.setZlhbzt("2");//已回报
}
//判断是否能够回报修改
if(zczlHb.getHbpj()!=null&&!"".equals(zczlHb.getHbpj())){
zczl.setNfhbxg("0");//不能回报修改
zczl.setHbpjdj(zczlHb.getPjdj());//回报评价等级(0-不合格 1-合格 2-优秀)
if("0".equals(zczlHb.getPjdj())){//评价等级0-不合格
//通过分派编号查询所有续报信息
List<TbYwZczlHb> zczlHbxbList = zczlService.getXbxxByFpbh(fpbh);
//能进行续报 不存在续报信息 评价等级不为空且只存在评价等级为0的
//能进行续报修改 续报信息存在且存在评价等级为空的续报信息
if(zczlHbxbList==null||zczlHbxbList.size()==0){
zczl.setNfxb("1");
//未续报
zczl.setZlxbzt("0");//指令续报状态(0-未续报;1-已续报(续报评价等级);2-待再次续报(续报评价不合格且未再次续报时使用))
}else{
zczl.setZlxbzt("1");//指令续报状态(0-未续报;1-已续报(续报评价等级))
String tempXb = "0";// 0-不能续报修改能续报 1-能续报修改不能续报 2-不能续报修改且不能续报
for(int t=0;t<zczlHbxbList.size();t++){
String pjdj = zczlHbxbList.get(t).getPjdj();
if(pjdj==null||"".equals(pjdj.trim())){
tempXb = "1";
break;
}else if("1".equals(pjdj)||"2".equals(pjdj)){
tempXb = "2";
zczl.setXbpjdj(pjdj);//续报报评价等级(0-不合格 1-合格 2-优秀)
break;
}
}
if("0".equals(tempXb)){
zczl.setNfxb("1");
zczl.setXbpjdj("0");//续报报评价等级(0-不合格 1-合格 2-优秀)
}else if("1".equals(tempXb)){
zczl.setNfxbxg("1");
}
}
}
}else{
zczl.setNfhbxg("1");
}
}else{
zczl.setNfhb("1");
//指令回报状态(0-未回报;1-超期未回报;2-已回报(评价等级);3-超期回报(评价等级);)
if(nowDate.getTime()>hbqx.getTime()+24*60*60*1000){
zczl.setZlhbzt("1");//超期未回报
}else{
zczl.setZlhbzt("0");//未回报
}
}
}
tbYwZczlList.set(i, zczl);
}
}
}
List<Map<String, Object>> jeMapList = new ArrayList<>();
Map<String, Object> objectMap;
if (null != tbYwZczlList && tbYwZczlList.size() > 0) {
for (TbYwZczl zczl : tbYwZczlList) {
objectMap = new HashMap<>();
objectMap.put("zlwh", zczl.getZlwh());//指令文号
objectMap.put("ywlx_str", zczl.getYwlx_str());//业务类型
objectMap.put("zllx_str", zczl.getZllx_str());//指令类型
objectMap.put("ywmc", zczl.getYwmc());//业务名称
objectMap.put("hbqx", zczl.getHbqx());//回报期限
objectMap.put("fbsj", zczl.getFbsj());//发布时间
objectMap.put("sfczhbxx", zczl.getSfczhbxx());//Sfczhbxx 是否存在回报信息
objectMap.put("zlfpgs", zczl.getZlfpgs());//指令分派个数
objectMap.put("zlqsgs", zczl.getZlqsgs());//指令签收个数
objectMap.put("zlhbcs", zczl.getZlhbcs());//指令回报个数
objectMap.put("zczlbh", zczl.getZczlbh());//侦查指令编号
objectMap.put("fpbh", zczl.getFpbh());//侦查指令分派编号(用于签收)
TbYwZczlFp fpxx = new TbYwZczlFp();
if(zczl.getFpbh()!=null&&!"".equals(zczl.getFpbh().trim())){
fpxx.setFpbh(zczl.getFpbh());
//根据分派编号拿到工作要求
TbYwZczlFp myFpxx = zczlService.getFpxxByTbYwZczlFp(fpxx);
objectMap.put("gzyq", myFpxx.getFpgzyq());//工作要求
}else{
objectMap.put("gzyq", "");//工作要求
}
objectMap.put("nffp", zczl.getNffp());//能否分派 0-不能 1-能
objectMap.put("nfqs", zczl.getNfqs());//能否签收 0-不能 1-能
objectMap.put("nfhb", zczl.getNfhb());//能否回报 0-不能 1-能
objectMap.put("nfhbxg", zczl.getNfhbxg());//能否回报修改 0-不能 1-能
objectMap.put("nfxb", zczl.getNfxb());//能否续报 0-不能 1-能
objectMap.put("nfxbxg", zczl.getNfxbxg());//能否续报修改 0-不能 1-能
objectMap.put("zlqszt", zczl.getZlqszt());//指令签收状态(0-未签收;1-超期未签收;2-已签收;3-超期签收;)
objectMap.put("zlhbzt", zczl.getZlhbzt());//指令回报状态(0-未回报;1-超期未回报;2-已回报(评价等级);3-超期回报(评价等级);)
objectMap.put("hbpjdj", zczl.getHbpjdj());//回报评价等级(0-不合格 1-合格 2-优秀)
objectMap.put("zlxbzt", zczl.getZlxbzt());//指令续报状态(0-未续报;1-已续报(续报评价等级))
objectMap.put("xbpjdj", zczl.getXbpjdj());//续报报评价等级(0-不合格 1-合格 2-优秀)
objectMap.put("zlfpdwHtml", zczl.getZlfpdwHtml());//指令分派单位拼接用的html
jeMapList.add(objectMap);
}
}
Map<String, Object> resultMapHtml = new HashMap<String, Object>();
resultMapHtml.put("total", totalCount);
resultMapHtml.put("rows", jeMapList);
return resultMapHtml;
}
//侦查指令签收
@RequestMapping("/zczlQsImp")
@ResponseBody
public String zczlQsImp(@RequestParam(value = "fpbh") String fpbh,
@RequestParam(value = "identitycard") String identitycard){
//拿到登录用户
User user = zczlService.getUserByIdCard(identitycard);
String message = "fail";
boolean bool = zczlService.zczlQs(fpbh,user);
if(bool){
message = "success";
TbYwZczlFp tempFp = new TbYwZczlFp();
tempFp.setFpbh(fpbh);
//根据分派编号拿到分派信息
TbYwZczlFp fpxx = zczlService.getFpxxByTbYwZczlFp(tempFp);
//根据侦查指令编号拿到侦查指令信息
TbYwZczl zczlxx = zczlService.getZczlxxByZczlbh(fpxx.getZczlbh());
SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");
String nowDate=simpleDateFormat.format(new Date());
List<String> usersIdentitycard = new ArrayList<>();
String xxnr = "指令文号为"+zczlxx.getZlwh()+"的侦查指令已于北京时间"+nowDate+"被"+fpxx.getQsrdwmc()+"的"+fpxx.getQsrxm()+"签收";
usersIdentitycard.add(fpxx.getFprgmsfhm());
messageService.sendMessage(usersIdentitycard,user.getIdentitycard(),xxnr,zczlxx.getZczlbh(),"020500");
}
return message;
}
} }
...@@ -200,4 +200,6 @@ public interface ZczlDao { ...@@ -200,4 +200,6 @@ public interface ZczlDao {
Integer toQueryBxqjsdzjzlsForTotal(TbYwZjZczl tbYwZjZczl); Integer toQueryBxqjsdzjzlsForTotal(TbYwZjZczl tbYwZjZczl);
List<TbYwZjZczl> getZjzlxxByHbbhFormZjzl(String hbbh); List<TbYwZjZczl> getZjzlxxByHbbhFormZjzl(String hbbh);
User getUserByIdCard(String identitycard);
} }
...@@ -185,4 +185,6 @@ public interface IZczlService { ...@@ -185,4 +185,6 @@ public interface IZczlService {
List<TbYwZjZczl> toQueryBxqjsdzjzls(TbYwZjZczl tbYwZjZczl, String unitcode); List<TbYwZjZczl> toQueryBxqjsdzjzls(TbYwZjZczl tbYwZjZczl, String unitcode);
List<TbYwZjZczl> getZjzlxxByHbbhFormZjzl(String hbbh); List<TbYwZjZczl> getZjzlxxByHbbhFormZjzl(String hbbh);
User getUserByIdCard(String identitycard);
} }
...@@ -2445,4 +2445,9 @@ public class ZczlService implements IZczlService { ...@@ -2445,4 +2445,9 @@ public class ZczlService implements IZczlService {
return zczlDao.getZjzlxxByHbbhFormZjzl(hbbh); return zczlDao.getZjzlxxByHbbhFormZjzl(hbbh);
} }
@Override
public User getUserByIdCard(String identitycard) {
return zczlDao.getUserByIdCard(identitycard);
}
} }
...@@ -2717,4 +2717,16 @@ ...@@ -2717,4 +2717,16 @@
from TB_YW_ZJ_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0' and zczl.HBBH=#{hbbh} from TB_YW_ZJ_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0' and zczl.HBBH=#{hbbh}
</select> </select>
<select id="getUserByIdCard" parameterType="java.lang.String" resultType="com.founder.model.User">
select
USERNAME username,
TRUE_NAME truename,
TELEPHONE telephone,
UNITCODE unitcode,
UNITNAME unitname,
POLICEMANID policemanid,
IDENTITYCARD identitycard
from SYS_USER where identitycard = #{identitycard} and scbz='0'
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment