|
@@ -46,6 +46,8 @@ import com.xt.jygl.gkjsgl.jgsq.vo.JgsqfjVo;
|
|
import com.xt.jygl.gkjsgl.jsjdgl.vo.JsjdfjVo;
|
|
import com.xt.jygl.gkjsgl.jsjdgl.vo.JsjdfjVo;
|
|
import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
|
|
import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
|
|
import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
|
|
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.gkjsgl.xmxxgl.vo.XmxxglVo;
|
|
import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
|
|
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.service.GkjyrService;
|
|
@@ -84,7 +86,9 @@ public class JgsqCtl extends BaseWebCtl {
|
|
private GkService gkService;
|
|
private GkService gkService;
|
|
@Autowired
|
|
@Autowired
|
|
private JgsqfjService jgsqfjService;
|
|
private JgsqfjService jgsqfjService;
|
|
-
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private XmbwglbService xmbwglbService;
|
|
|
|
+
|
|
@RequestMapping(value = "/main")
|
|
@RequestMapping(value = "/main")
|
|
@RequiresPermissions("jgsq: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 {
|
|
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 {
|
|
@@ -747,7 +751,20 @@ public class JgsqCtl extends BaseWebCtl {
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
|
|
vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
|
|
-
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(entity.getXmbm())) {
|
|
|
|
+ String codeid = entity.getXmbm().substring(4, 10);
|
|
|
|
+ CodeEntity code = securityMgr.codeService().findOne(codeid);
|
|
|
|
+ model.addAttribute("xzqhname", code.getText());
|
|
|
|
+ }
|
|
|
|
+ String bwids = "";
|
|
|
|
+ List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
|
|
|
|
+ if (bwlist != null && bwlist.size() > 0) {
|
|
|
|
+ model.addAttribute("bwgs", bwlist.size());
|
|
|
|
+ for (XmbwglbEntity xmbw : bwlist) {
|
|
|
|
+ bwids = bwids + xmbw.getBwid() + ",";
|
|
|
|
+ }
|
|
|
|
+ bwids = bwids.substring(0, bwids.length() - 1);
|
|
|
|
+ }
|
|
// 附件
|
|
// 附件
|
|
List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
|
|
List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
|
|
for (int i = 0; i < accessoryList.size(); i++) {
|
|
for (int i = 0; i < accessoryList.size(); i++) {
|
|
@@ -882,7 +899,20 @@ public class JgsqCtl extends BaseWebCtl {
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
|
|
vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
|
|
-
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(entity.getXmbm())) {
|
|
|
|
+ String codeid = entity.getXmbm().substring(4, 10);
|
|
|
|
+ CodeEntity code = securityMgr.codeService().findOne(codeid);
|
|
|
|
+ model.addAttribute("xzqhname", code.getText());
|
|
|
|
+ }
|
|
|
|
+ String bwids = "";
|
|
|
|
+ List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
|
|
|
|
+ if (bwlist != null && bwlist.size() > 0) {
|
|
|
|
+ model.addAttribute("bwgs", bwlist.size());
|
|
|
|
+ for (XmbwglbEntity xmbw : bwlist) {
|
|
|
|
+ bwids = bwids + xmbw.getBwid() + ",";
|
|
|
|
+ }
|
|
|
|
+ bwids = bwids.substring(0, bwids.length() - 1);
|
|
|
|
+ }
|
|
// 附件
|
|
// 附件
|
|
List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
|
|
List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
|
|
for (int i = 0; i < accessoryList.size(); i++) {
|
|
for (int i = 0; i < accessoryList.size(); i++) {
|