diff --git a/src/main/java/com/zcloud/controller/app/AppUsersController.java b/src/main/java/com/zcloud/controller/app/AppUsersController.java index 97c26102..33e70397 100644 --- a/src/main/java/com/zcloud/controller/app/AppUsersController.java +++ b/src/main/java/com/zcloud/controller/app/AppUsersController.java @@ -7,6 +7,7 @@ import java.util.Map; import com.zcloud.service.system.*; import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.DisabledAccountException; @@ -397,4 +398,22 @@ public class AppUsersController extends BaseController { map.put("result", errInfo); return map; } + + //根据用户id查询部门 + @RequestMapping(value="/getDepartmentByUserId") + @ResponseBody + public Object getDepartmentByUserId()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData data = usersService.findById(pd); + if (data == null || StringUtils.equals(data.getString("DEPARTMENT_ID"),"")) { + map.put("result", errInfo); + return map; + } + map.put("data", data); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java index b5484661..1ff1699c 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java @@ -34,6 +34,8 @@ public class AppHomeController extends BaseController { @Resource private GFBreakGroundService GFbreakGroundService; + @Resource + private GFConfinedSpaceService GFconfinedspaceService; @Autowired private ConfinedSpaceService confinedspaceService; @@ -77,7 +79,7 @@ public class AppHomeController extends BaseController { pd = this.getPageData(); PageData blindboardCount = GFblindboardService.countCheck(pd);// 待办盲板作业数统计 PageData breakGroundCount = GFbreakGroundService.countCheck(pd);// 待办动土作业数统计 - PageData confinedspaceCount = confinedspaceService.countCheck(pd);// 待办有限空间作业数统计 + PageData confinedspaceCount = GFconfinedspaceService.countCheck(pd);// 待办有限空间作业数统计 PageData electricityCount = GFelectricityService.countCheck(pd);// 待办临时用电作业数统计 PageData highworkCount = GFhighworkService.countCheck(pd);// 待办高处作业数统计 PageData hoistingCount = GFhoistingService.countCheck(pd);// 待办吊装作业数统计 diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index f696040b..94ed8b8e 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -14,6 +14,7 @@ import com.zcloud.service.highriskwork.HotWorkSafetyMethodRecordService; import com.zcloud.service.highriskwork.HotworkToMeasuresService; import com.zcloud.service.system.DictionariesService; import com.zcloud.service.system.FHlogService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import com.zcloud.util.message.MessageService; import org.apache.commons.io.FileUtils; @@ -86,6 +87,8 @@ public class AppHotWorkApplicationController extends BaseController { * */ @Autowired + private UsersService usersService; + @Autowired private HotWorkApplicationService hotworkapplicationService; @Autowired private HotWorkApplicationUserService hotWorkApplicationUserService; @@ -1753,7 +1756,8 @@ public class AppHotWorkApplicationController extends BaseController { content.put("params2", "延时监火"); content.put("params3", "处理");// 作业操作 mes.put("CONTENT", content);// 站内信内容 - noticeCorpService.sendNotice(mes); + noticeCorpService.sendNoticeToDep(mes); //向部门中的所有人员发通知 +// noticeCorpService.sendNotice(mes); } else if(hot.getString("STATE").equals("30")){ PageData hotUser = hotUserList.get(0); String userID = hotUser.getString("USER_ID"); diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index 1308325e..0a0a35e0 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -274,6 +274,7 @@ public class CorpInfoController extends BaseController { pd2.put("TYPE",2); List fourImgs = imgfilesService.listAll(pd2);//四色图照图片 pd.put("INDUSTRYALL", CORP_TYPEALL); + pd.put("FOURTYPE", "1"); map.put("pd", pd); map.put("pdrelated",pdrelated); map.put("busImgs", busImgs); diff --git a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java index 63b3648d..668e1c79 100644 --- a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java @@ -156,6 +156,13 @@ public class IdentificationPartsController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + List byName = identificationpartsService.findByName(pd); + if (byName != null && byName.size() > 0) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "辨识部位已存在，请修改后重试"); + return map; + } pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 identificationpartsService.edit(pd); diff --git a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java index 65740013..611c6aa5 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java @@ -75,7 +75,7 @@ public class RiskUnitController extends BaseController { //pd.put("DEPARTMENT_ID",Jurisdiction.getDEPARTMENT_ID()); List list = riskunitService.listAll(pd); if(list!=null&&list.size()>0) { - map.put("result", "failed"); + map.put("result", "fail"); map.put("exception", "风险点（单元）已存在，请修改后重试"); return map; } diff --git a/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java b/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java index 91059b1f..634a357f 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java @@ -23,6 +23,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.firemanager.FireDeviceService; import com.zcloud.util.*; import com.zcloud.util.logAop.LogOperation; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -389,4 +390,57 @@ public class FireDeviceController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 导出数据到excel + * @return + * @throws Exception + */ + @RequestMapping(value = "/excelAll") + public ModelAndView excelAll() throws Exception { + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); +// String paramJson = pd.getString("param"); +// Map param = (Map) JSON.parse(paramJson); +// pd.putAll(param); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List varList = fireDeviceService.exportDataList(pd); + List exportList = new ArrayList<>(); //导出的数据列表 + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("消防区域编码"); + titles.add("消防点位名称"); + titles.add("消防点位编码"); + titles.add("负责部门"); + titles.add("负责人手机号"); + titles.add("消防器材类型"); + titles.add("消防器材编码"); + titles.add("有效期开始"); + titles.add("结束时间"); + titles.add("存放地点"); + titles.add("负责人"); + dataMap.put("titles", titles); + for (int i = 0; i < varList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", varList.get(i).getString("FIRE_REGION_CODE")); //消防区域编码 + vpd.put("var2", varList.get(i).getString("FIRE_POINT_NAME")); //消防点位名称 + vpd.put("var3", varList.get(i).getString("FIRE_POINT_CODE")); //消防点位编码 + vpd.put("var4", varList.get(i).getString("DEPARTMENTNAME")); //负责部门 + vpd.put("var5", varList.get(i).getString("USER_PHONE")); //负责人手机号 + vpd.put("var6", varList.get(i).getString("FIRE_DEVICE_TYPE_NAME")); //消防器材类型 + vpd.put("var7", varList.get(i).getString("FIRE_DEVICE_CODE")); //消防器材编码 + vpd.put("var8", varList.get(i).getString("VALIDITY_START_TIME")); //有效期开始 + vpd.put("var9", varList.get(i).getString("VALIDITY_END_TIME"));//结束时间 + vpd.put("var10", varList.get(i).getString("REMAKE"));//存放地点 + vpd.put("var11", varList.get(i).getString("USERNAME"));//负责人 + exportList.add(vpd); + } + dataMap.put("varList", exportList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } } diff --git a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java index ff394201..5bd872b4 100644 --- a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java +++ b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java @@ -821,6 +821,15 @@ public class HiddenApiController extends BaseController { if ("list".equals(pd.getString("hiddenVueType"))) { // 整改隐患 pd = Jurisdiction.getUserDataJurisdiction(pd); } + List hiddenTypeList = new ArrayList<>(); + for (Object key : pd.keySet()) { + if (key.toString().contains("hiddenType[")) { + hiddenTypeList.add(pd.getString(key.toString())); + } + } + if (hiddenTypeList.size() > 0) { + pd.put("hiddenTypeList", hiddenTypeList); + } /*上方的条件选择都是 condform */ /** diff --git a/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java index 94c210df..5859d6ee 100644 --- a/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java @@ -4,7 +4,7 @@ import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -17,37 +17,37 @@ public interface NoticeCorpUserMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -58,7 +58,7 @@ public interface NoticeCorpUserMapper{ * @param pd */ void savaAll(PageData pd); - + void deleteByNotId(PageData pd); List getTypeCountByNotId (Page page); /** @@ -68,5 +68,11 @@ public interface NoticeCorpUserMapper{ * @throws Exception */ List getReadUserlistPage(Page page); + + /** + * 批量添加公告人员关系信息 + * @param noticeCorpUserList + */ + void batchSave(List noticeCorpUserList); } diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java index 2ff6a166..ae8154ea 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java @@ -110,4 +110,6 @@ public interface FireDeviceMapper { void delDevicePreparedByIds(List fireCheckIdList); void deleteAll(PageData pd); + + List exportDataList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 73227ebc..376f7003 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -308,4 +308,6 @@ public interface UsersMapper { PageData getPersonByCardNo(PageData pd); PageData findByCardNo(PageData pd); + + List listUserByDepId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/bus/NoticeCorpService.java b/src/main/java/com/zcloud/service/bus/NoticeCorpService.java index 8fe519c7..16cce0c0 100644 --- a/src/main/java/com/zcloud/service/bus/NoticeCorpService.java +++ b/src/main/java/com/zcloud/service/bus/NoticeCorpService.java @@ -82,5 +82,12 @@ public interface NoticeCorpService{ * @param pd */ void sendNotice(PageData pd)throws Exception; + + /** + * 向部门中所有人员发送站内信 + * @param mes + * @throws Exception + */ + void sendNoticeToDep(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java b/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java index 6bbd972d..78751a8d 100644 --- a/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java +++ b/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java @@ -4,7 +4,7 @@ import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -17,43 +17,43 @@ public interface NoticeCorpUserService{ * @throws Exception */ public void save(PageData pd)throws Exception; - + /**删除 * @param pd * @throws Exception */ public void delete(PageData pd)throws Exception; - + /**修改 * @param pd * @throws Exception */ public void edit(PageData pd)throws Exception; - + /**列表 * @param page * @throws Exception */ public List list(Page page)throws Exception; - + /**列表(全部) * @param pd * @throws Exception */ public List listAll(PageData pd)throws Exception; - + /**通过id获取数据 * @param pd * @throws Exception */ public PageData findById(PageData pd)throws Exception; - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception; - + public void saveAll (PageData pd) throws Exception; void deleteByNotId (PageData pd) throws Exception; List getTypeCountByNotId (Page page) throws Exception; @@ -64,5 +64,12 @@ public interface NoticeCorpUserService{ * @throws Exception */ List getUserReadLiser(Page page) throws Exception; + + /** + * 批量添加公告人员关系 + * @param noticeCorpUserList + * @throws Exception + */ + void batchSave(List noticeCorpUserList) throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java index fadc0770..99d0b82d 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java @@ -82,7 +82,12 @@ public class CorpInfoServiceImpl implements CorpInfoService{ * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return corpinfoMapper.findById(pd); + PageData byId = corpinfoMapper.findById(pd); + if (byId.get("FOURTYPE") != null) { + String fourtype = byId.get("FOURTYPE").toString(); + byId.put("FOURTYPE", fourtype); + } + return byId; } /**批量删除 diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java index e5cea23f..05d46121 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java @@ -4,6 +4,7 @@ import java.util.*; import com.zcloud.service.bus.NoticeCorpUserService; import com.zcloud.service.bus.NoticeTemplateService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; @@ -34,6 +35,8 @@ public class NoticeCorpServiceImpl implements NoticeCorpService{ private NoticeCorpService noticeCorpService; @Autowired private NoticeCorpUserService noticeCorpUserService; + @Autowired + private UsersService usersService; /**新增 * @param pd @@ -165,5 +168,54 @@ public class NoticeCorpServiceImpl implements NoticeCorpService{ pd1.put("TYPE",0); noticeCorpUserService.save(pd1); } + + @Override + public void sendNoticeToDep(PageData pd) throws Exception { + PageData notice = noticeTemplateService.findByBianMa(pd); + String content = ""; + if(notice!=null){ + content = notice.getString("CONTENT"); + PageData contentPd = (PageData) pd.get("CONTENT"); + for(Object key : contentPd.keySet()){ //替换占位符 + if ("number".equals(key.toString()) && Tools.notEmpty(pd.getString("WORKURL"))) { + content = content.replace("${" + key.toString() + "}", ""+contentPd.get(key).toString()+""); + } else { + content = content.replace("${" + key.toString() + "}", contentPd.get(key).toString()); + } + } + }else { + content = "未维护模板,需要管理端-公告模板进行维护"; + } + + PageData pd1 = new PageData(); + pd1.put("NOTICECORP_ID", UuidUtil.get32UUID()); + pd1.put("USERNAME",pd.getString("SENDER_NAME")); + pd1.put("CREATOR", pd.getString("SENDER_ID")); //添加人 + pd1.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd1.put("SYNOPSIS",pd.getString("SYNOPSIS")); + pd1.put("WORKURL",pd.getString("WORKURL")); + pd1.put("CONTENT","

"+content+"

"); + pd1.put("ISALL","yes"); + pd1.put("ISREPLY",0); + pd1.put("ISDELETE",0); + pd1.put("ISTOP",0); + pd1.put("STATUS",1); + pd1.put("CORP_INFO_ID",pd.getString("CORPINFO_ID")); + noticeCorpService.save(pd1); + List userList = usersService.listUserByDepId(pd); + if (userList != null && userList.size() > 0) { + List noticeCorpUserList = new ArrayList<>(); + for (PageData user : userList) { + PageData noticeCorpUser = new PageData(); + pd1.put("NOTICECORPUSERID_ID",UuidUtil.get32UUID()); + pd1.put("USER_ID",user.getString("USER_ID")); + pd1.put("TYPE",0); + noticeCorpUser.putAll(pd1); + noticeCorpUserList.add(noticeCorpUser); + } + noticeCorpUserService.batchSave(noticeCorpUserList); + } +// noticeCorpUserService.save(pd1); + } } diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java index abed78e7..c73f63b2 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java @@ -9,7 +9,7 @@ import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.bus.NoticeCorpUserMapper; import com.zcloud.service.bus.NoticeCorpUserService; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -21,7 +21,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ @Autowired private NoticeCorpUserMapper noticecorpuseridMapper; - + /**新增 * @param pd * @throws Exception @@ -29,7 +29,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void save(PageData pd)throws Exception{ noticecorpuseridMapper.save(pd); } - + /**删除 * @param pd * @throws Exception @@ -37,7 +37,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void delete(PageData pd)throws Exception{ noticecorpuseridMapper.delete(pd); } - + /**修改 * @param pd * @throws Exception @@ -45,7 +45,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void edit(PageData pd)throws Exception{ noticecorpuseridMapper.edit(pd); } - + /**列表 * @param page * @throws Exception @@ -53,7 +53,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public List list(Page page)throws Exception{ return noticecorpuseridMapper.datalistPage(page); } - + /**列表(全部) * @param pd * @throws Exception @@ -61,7 +61,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public List listAll(PageData pd)throws Exception{ return noticecorpuseridMapper.listAll(pd); } - + /**通过id获取数据 * @param pd * @throws Exception @@ -69,7 +69,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public PageData findById(PageData pd)throws Exception{ return noticecorpuseridMapper.findById(pd); } - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -106,6 +106,11 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ // TODO Auto-generated method stub return noticecorpuseridMapper.getReadUserlistPage(page); } - + + @Override + public void batchSave(List noticeCorpUserList) throws Exception { + noticecorpuseridMapper.batchSave(noticeCorpUserList); + } + } diff --git a/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java b/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java index ae0e4b44..488b0c1e 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java @@ -56,4 +56,6 @@ public interface FireDeviceService { void removeFireDeviceByIds(PageData pd); + + List exportDataList(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java index 4717e555..f8e544ba 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java @@ -263,5 +263,10 @@ public class FireDeviceServiceImpl implements FireDeviceService { } } + @Override + public List exportDataList(PageData pd) throws Exception { + return fireDeviceMapper.exportDataList(pd); + } + } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 93001988..5a3ae771 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -360,4 +360,6 @@ public interface UsersService { PageData getPersonByCardNo(PageData pd) throws Exception; PageData findByCardNo(PageData pd) throws Exception; + + List listUserByDepId(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index c432b75a..a9951e90 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -491,4 +491,9 @@ public class UsersServiceImpl implements UsersService { public PageData findByCardNo(PageData pd)throws Exception{ return usersMapper.findByCardNo(pd); } + + @Override + public List listUserByDepId(PageData pd) throws Exception { + return usersMapper.listUserByDepId(pd); + } } diff --git a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml index 860f3659..bffe4d77 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml @@ -222,6 +222,7 @@ CODE = #{CODE}, COMPANY_AREA = #{COMPANY_AREA}, ADDRESS = #{ADDRESS}, + ADDRESS_BUSINESS = #{ADDRESS_BUSINESS}, CREATE_DATE = #{CREATE_DATE}, SCALE = #{SCALE}, LONGITUDE = #{LONGITUDE}, diff --git a/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml b/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml index 608fec45..389aa646 100644 --- a/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml @@ -147,7 +147,18 @@ - + + + insert into + ( + + ) values + + ( #{item.NOTICECORP_ID}, #{item.USER_ID},0, #{item.NOTICECORPUSERID_ID} ) + + + + delete from where NOTICECORP_ID = #{NOTICECORP_ID} diff --git a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml index 4d6bfc1d..0ac65962 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml @@ -301,4 +301,56 @@ + + diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index 6af6dad9..abbca825 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -427,8 +427,11 @@ and f.STATE = #{pd.state} - - and f.HIDDENTYPE = #{pd.hiddenType} + + and f.HIDDENTYPE in + + #{pd.hiddenTypeList[${index}]} + and ( diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 022c4347..7121f2de 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -374,6 +374,9 @@ and f.STATE = 4 + + + and f.SOURCE = #{pd.SOURCE} and f.HIDDENLEVEL = #{pd.HIDDENLEVEL} diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 7ab21186..c24965e2 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1438,4 +1438,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.CARDNO = #{CARDNO} + + diff --git a/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls b/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls index 707f36eb..8b884d31 100644 Binary files a/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls and b/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls differ