|
|
@@ -48,8 +48,11 @@ import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
|
|
|
import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
|
|
|
import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
|
|
|
import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;
|
|
|
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
|
|
|
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
|
|
|
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
|
|
|
import com.xt.jygl.workflow.entity.TaskInfoEntity;
|
|
|
import com.xt.jygl.workflow.service.TaskInfoService;
|
|
|
import com.xt.jygl.workflow.vo.TaskInfoVo;
|
|
|
@@ -87,7 +90,8 @@ public class JgsqCtl extends BaseWebCtl {
|
|
|
private JgsqfjService jgsqfjService;
|
|
|
@Autowired
|
|
|
private XmbwglbService xmbwglbService;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private BwService bwService;
|
|
|
@RequestMapping(value = "/main")
|
|
|
@RequiresPermissions("jgsq:main")
|
|
|
public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
|
|
|
@@ -763,6 +767,7 @@ public class JgsqCtl extends BaseWebCtl {
|
|
|
bwids = bwids + xmbw.getBwid() + ",";
|
|
|
}
|
|
|
bwids = bwids.substring(0, bwids.length() - 1);
|
|
|
+ getbwlist(model, bwids);
|
|
|
}
|
|
|
// 附件
|
|
|
List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jgsq");
|
|
|
@@ -861,6 +866,75 @@ public class JgsqCtl extends BaseWebCtl {
|
|
|
return "gkjsgl/jgsq/jgsqedit";
|
|
|
}
|
|
|
|
|
|
+ public void getbwlist(Model model, String bwids) {
|
|
|
+ if (!StringUtils.isEmpty(bwids)) {
|
|
|
+ List<BwVo> slist = new ArrayList<BwVo>();
|
|
|
+ String[] bwlists = bwids.split(",");
|
|
|
+ for (String bw : bwlists) {
|
|
|
+ BwEntity bwentity = bwService.findOne(bw);
|
|
|
+ BwVo bwvo = new BwVo();
|
|
|
+ if (bwentity != null) {
|
|
|
+ BeanUtils.copyProperties(bwentity, bwvo);
|
|
|
+ bwvo.setSzdzw(bwentity.getSzd() != null ? bwentity.getSzd().getText() : "");
|
|
|
+ bwvo.setSzgkzw(bwentity.getSzgk() != null ? bwentity.getSzgk().getGkmc() : "");
|
|
|
+ bwvo.setSzgqzw(bwentity.getSzgq() != null ? bwentity.getSzgq().getGqmc() : "");
|
|
|
+ bwvo.setSsjyrzw(bwentity.getSsjyr() != null ? bwentity.getSsjyr().getGkjyr() : "");
|
|
|
+ bwvo.setSsmtzw(bwentity.getSsmt() != null ? bwentity.getSsmt().getMtmc() : "");
|
|
|
+ bwvo.setBwsxzw(bwentity.getBwsx() != null ? bwentity.getBwsx().getText() : "");
|
|
|
+ bwvo.setFwlxzw(bwentity.getFwlx() != null ? bwentity.getFwlx().getText() : "");
|
|
|
+ bwvo.setWxpbwzw(bwentity.getWxpbw() != null ? bwentity.getWxpbw().getText() : "");
|
|
|
+ bwvo.setZyhbwflzw(bwentity.getZyhbwfl() != null ? bwentity.getZyhbwfl().getText() : "");
|
|
|
+ bwvo.setSffzzw(bwentity.getSffz() != null ? bwentity.getSffz().getText() : "");
|
|
|
+ bwvo.setSfdwkfzw(bwentity.getSfdwkf() != null ? bwentity.getSfdwkf().getText() : "");
|
|
|
+ bwvo.setBwszsxzw(bwentity.getBwszsx() != null ? bwentity.getBwszsx().getText() : "");
|
|
|
+ bwvo.setSclxzw(bwentity.getSclx() != null ? bwentity.getSclx().getText() : "");
|
|
|
+ bwvo.setJgxszw(bwentity.getJgxs() != null ? bwentity.getJgxs().getText() : "");
|
|
|
+ bwvo.setKbcblxzw(bwentity.getKbcblx() != null ? bwentity.getKbcblx().getText() : "");
|
|
|
+
|
|
|
+ bwvo.setSszyq(bwentity.getSszyq() != null ? bwentity.getSszyq().getId() : "");
|
|
|
+ bwvo.setSszyqzw(bwentity.getSszyq() != null ? bwentity.getSszyq().getZyqmc() : "");
|
|
|
+ bwvo.setZls(bwentity.getZls() != null ? bwentity.getZls().getId() : "");
|
|
|
+ bwvo.setZlszw(bwentity.getZls() != null ? bwentity.getZls().getText() : "");
|
|
|
+ bwvo.setXp(bwentity.getXp() != null ? bwentity.getXp().getId() : "");
|
|
|
+ bwvo.setXpzw(bwentity.getXp() != null ? bwentity.getXp().getText() : "");
|
|
|
+ bwvo.setBwszhd(bwentity.getBwszhd() != null ? bwentity.getBwszhd().getText() : "");
|
|
|
+
|
|
|
+ if (bwentity.getBwyt() != null) {
|
|
|
+ String bwytzw = "";
|
|
|
+ String[] s = bwentity.getBwyt().split(",");
|
|
|
+
|
|
|
+ for (int i = 0; i < s.length; i++) {
|
|
|
+ CodeEntity ce = securityMgr.codeService().findOne(s[i]);
|
|
|
+ if (ce != null) {
|
|
|
+ bwytzw += ce.getText();
|
|
|
+ if (i != s.length - 1) {
|
|
|
+ bwytzw += ",";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ bwvo.setBwytzw(bwytzw);
|
|
|
+ }
|
|
|
+ bwvo.setSzd(bwentity.getSzd() != null ? bwentity.getSzd().getId() : "");
|
|
|
+ bwvo.setSzgk(bwentity.getSzgk() != null ? bwentity.getSzgk().getId() : "");
|
|
|
+ bwvo.setSzgq(bwentity.getSzgq() != null ? bwentity.getSzgq().getId() : "");
|
|
|
+ bwvo.setSsjyr(bwentity.getSsjyr() != null ? bwentity.getSsjyr().getId() : "");
|
|
|
+ bwvo.setSsmt(bwentity.getSsmt() != null ? bwentity.getSsmt().getId() : "");
|
|
|
+ bwvo.setBwsx(bwentity.getBwsx() != null ? bwentity.getBwsx().getId() : "");
|
|
|
+ bwvo.setFwlx(bwentity.getFwlx() != null ? bwentity.getFwlx().getId() : "");
|
|
|
+ bwvo.setWxpbw(bwentity.getWxpbw() != null ? bwentity.getWxpbw().getId() : "");
|
|
|
+ bwvo.setZyhbwfl(bwentity.getZyhbwfl() != null ? bwentity.getZyhbwfl().getId() : "");
|
|
|
+ bwvo.setSffz(bwentity.getSffz() != null ? bwentity.getSffz().getId() : "");
|
|
|
+ bwvo.setSfdwkf(bwentity.getSfdwkf() != null ? bwentity.getSfdwkf().getId() : "");
|
|
|
+ bwvo.setBwszsx(bwentity.getBwszsx() != null ? bwentity.getBwszsx().getId() : "");
|
|
|
+ bwvo.setSclx(bwentity.getSclx() != null ? bwentity.getSclx().getId() : "");
|
|
|
+ bwvo.setJgxs(bwentity.getJgxs() != null ? bwentity.getJgxs().getId() : "");
|
|
|
+ slist.add(bwvo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ model.addAttribute("bwlist", slist);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@RequestMapping(value = "/view")
|
|
|
public String view(Model model, String id, String flag, String opflag) {
|
|
|
model.addAttribute("flag", flag);
|
|
|
@@ -914,6 +988,7 @@ public class JgsqCtl extends BaseWebCtl {
|
|
|
bwids = bwids + xmbw.getBwid() + ",";
|
|
|
}
|
|
|
bwids = bwids.substring(0, bwids.length() - 1);
|
|
|
+ getbwlist(model, bwids);
|
|
|
}
|
|
|
// 附件
|
|
|
List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jgsq");
|
ld_xuhx