diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java index fc7f86b..c41d777 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IPersonService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,8 +35,16 @@ */ @GetMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(personService.selectList(null)); + public Object list(String deptId, String personType) { + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) { + query.eq("DEPTID", deptId); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq("PERSON_TYPE", personType); + } + query.eq("DELFLAG", 0); + return ResponseData.success(personService.selectList(query)); } /** @@ -43,12 +52,21 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String sex, String duty, String deptId) { + public Object listPage(String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt("a.CREATETIME", startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt("a.CREATETIME", endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq("a.PERSON_TYPE", personType); + } - if(ToolUtil.isNotEmpty(duty)){ - query.eq("a.DUTY",duty); + if (ToolUtil.isNotEmpty(duty)) { + query.eq("a.DUTY", duty); } if (ToolUtil.isNotEmpty(deptId)) { query.eq("a.DEPTID", deptId); @@ -57,18 +75,21 @@ query.eq("a.SEX", sex); } query.eq("a.DELFLAG", 0); - if(ToolUtil.isNotEmpty(keywords)){ - query.andNew().like("a.NAME",keywords).or().like("a.ID_CARD_NO",keywords); + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like("a.NAME", keywords).or().like("a.ID_CARD_NO", keywords); } - List scopePersons = personService.selectDataScopePerson(page,permissionService.getCurrUserDataScope(), query); + + List scopePersons = personService.selectDataScopePerson(page, permissionService.getCurrUserDataScope(), query); page.setRecords(scopePersons); + query.orderBy("a.person_code"); //展示数据封装 page.getRecords().forEach(person -> { person.setDeptName(permissionService.getDeptName(person.getDeptid())); person.setSexName(permissionService.getDictNameByCode("sysSex", person.getSex())); person.setPersonTypeName(permissionService.getDictNameByCode("personType", person.getSex())); + person.setDutyName(permissionService.getDictNameByCode("dutyType", person.getDuty())); + person.setNationName(permissionService.getDictNameByCode("nationType", person.getNation())); }); - return ResponseData.success(super.packForBT(page)); } @@ -78,8 +99,14 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(@RequestBody Person person) { - person.setOprationId(permissionService.getCurrLoginUser().getId()); - return ResponseData.success(personService.insert(person)); + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + return ResponseData.success(personService.insert(person)); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + return ResponseData.error("人员编码重复"); + } + } /** @@ -108,9 +135,14 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(@RequestBody Person person) { - person.setOprationId(permissionService.getCurrLoginUser().getId()); - personService.updateById(person); - return ResponseData.success(); + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + personService.updateById(person); + return ResponseData.success(); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + return ResponseData.error("人员编码重复"); + } } /** diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java index fc7f86b..c41d777 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IPersonService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,8 +35,16 @@ */ @GetMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(personService.selectList(null)); + public Object list(String deptId, String personType) { + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) { + query.eq("DEPTID", deptId); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq("PERSON_TYPE", personType); + } + query.eq("DELFLAG", 0); + return ResponseData.success(personService.selectList(query)); } /** @@ -43,12 +52,21 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String sex, String duty, String deptId) { + public Object listPage(String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt("a.CREATETIME", startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt("a.CREATETIME", endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq("a.PERSON_TYPE", personType); + } - if(ToolUtil.isNotEmpty(duty)){ - query.eq("a.DUTY",duty); + if (ToolUtil.isNotEmpty(duty)) { + query.eq("a.DUTY", duty); } if (ToolUtil.isNotEmpty(deptId)) { query.eq("a.DEPTID", deptId); @@ -57,18 +75,21 @@ query.eq("a.SEX", sex); } query.eq("a.DELFLAG", 0); - if(ToolUtil.isNotEmpty(keywords)){ - query.andNew().like("a.NAME",keywords).or().like("a.ID_CARD_NO",keywords); + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like("a.NAME", keywords).or().like("a.ID_CARD_NO", keywords); } - List scopePersons = personService.selectDataScopePerson(page,permissionService.getCurrUserDataScope(), query); + + List scopePersons = personService.selectDataScopePerson(page, permissionService.getCurrUserDataScope(), query); page.setRecords(scopePersons); + query.orderBy("a.person_code"); //展示数据封装 page.getRecords().forEach(person -> { person.setDeptName(permissionService.getDeptName(person.getDeptid())); person.setSexName(permissionService.getDictNameByCode("sysSex", person.getSex())); person.setPersonTypeName(permissionService.getDictNameByCode("personType", person.getSex())); + person.setDutyName(permissionService.getDictNameByCode("dutyType", person.getDuty())); + person.setNationName(permissionService.getDictNameByCode("nationType", person.getNation())); }); - return ResponseData.success(super.packForBT(page)); } @@ -78,8 +99,14 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(@RequestBody Person person) { - person.setOprationId(permissionService.getCurrLoginUser().getId()); - return ResponseData.success(personService.insert(person)); + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + return ResponseData.success(personService.insert(person)); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + return ResponseData.error("人员编码重复"); + } + } /** @@ -108,9 +135,14 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(@RequestBody Person person) { - person.setOprationId(permissionService.getCurrLoginUser().getId()); - personService.updateById(person); - return ResponseData.success(); + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + personService.updateById(person); + return ResponseData.success(); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + return ResponseData.error("人员编码重复"); + } } /** diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml index 295c59a..9bb8912 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml @@ -19,7 +19,7 @@ a.ID AS id, a.DELFLAG AS delflag, a.CREATETIME AS createtime, a.UPDATETIME AS updatetime, a.NAME AS name, a.SEX AS sex, a.DEPTID AS deptid, a.ID_CARD_NO AS idCard, a.REMARKS AS remarks, a.PERSON_TYPE AS personType - ,a.DUTY + ,a.DUTY,a.NATION,a.BIRTHDAY,a.OPRATION_ID as oprationId diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java index 362678c..78fbd5f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java @@ -3,13 +3,14 @@ import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotations.*; import com.baomidou.mybatisplus.enums.IdType; -import com.casic.missiles.core.annotations.MetaData; import com.casic.missiles.core.annotations.MetaDataBean; +import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.core.base.model.DataMetaModel; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.sql.Timestamp; import java.util.Date; /** @@ -31,14 +32,15 @@ /** * 状态(0：有效 1：删除） */ - @TableLogic - @TableField("DELFLAG") + + @TableLogic(delval = "1") private String delflag; /** * 创建时间 */ - @TableField("CREATETIME") - private Date createtime; + @TableField(value = "CREATETIME") + @JSONField(serializeUsing = DateDeserializer.class) + private Timestamp createtime; /** * 修改时间 */ @@ -81,6 +83,10 @@ private String personCode; @TableField("OPRATION_ID") private Long oprationId; + private String duty; + private String nation; + private Date birthday; + //人员编码 @TableField(exist = false) private String deptName; @@ -90,6 +96,10 @@ private String sexName; @TableField(exist = false) private String oprationName; + @TableField(exist = false) + private String dutyName; + @TableField(exist = false) + private String nationName; @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java index fc7f86b..c41d777 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IPersonService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,8 +35,16 @@ */ @GetMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(personService.selectList(null)); + public Object list(String deptId, String personType) { + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) { + query.eq("DEPTID", deptId); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq("PERSON_TYPE", personType); + } + query.eq("DELFLAG", 0); + return ResponseData.success(personService.selectList(query)); } /** @@ -43,12 +52,21 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String sex, String duty, String deptId) { + public Object listPage(String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt("a.CREATETIME", startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt("a.CREATETIME", endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq("a.PERSON_TYPE", personType); + } - if(ToolUtil.isNotEmpty(duty)){ - query.eq("a.DUTY",duty); + if (ToolUtil.isNotEmpty(duty)) { + query.eq("a.DUTY", duty); } if (ToolUtil.isNotEmpty(deptId)) { query.eq("a.DEPTID", deptId); @@ -57,18 +75,21 @@ query.eq("a.SEX", sex); } query.eq("a.DELFLAG", 0); - if(ToolUtil.isNotEmpty(keywords)){ - query.andNew().like("a.NAME",keywords).or().like("a.ID_CARD_NO",keywords); + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like("a.NAME", keywords).or().like("a.ID_CARD_NO", keywords); } - List scopePersons = personService.selectDataScopePerson(page,permissionService.getCurrUserDataScope(), query); + + List scopePersons = personService.selectDataScopePerson(page, permissionService.getCurrUserDataScope(), query); page.setRecords(scopePersons); + query.orderBy("a.person_code"); //展示数据封装 page.getRecords().forEach(person -> { person.setDeptName(permissionService.getDeptName(person.getDeptid())); person.setSexName(permissionService.getDictNameByCode("sysSex", person.getSex())); person.setPersonTypeName(permissionService.getDictNameByCode("personType", person.getSex())); + person.setDutyName(permissionService.getDictNameByCode("dutyType", person.getDuty())); + person.setNationName(permissionService.getDictNameByCode("nationType", person.getNation())); }); - return ResponseData.success(super.packForBT(page)); } @@ -78,8 +99,14 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(@RequestBody Person person) { - person.setOprationId(permissionService.getCurrLoginUser().getId()); - return ResponseData.success(personService.insert(person)); + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + return ResponseData.success(personService.insert(person)); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + return ResponseData.error("人员编码重复"); + } + } /** @@ -108,9 +135,14 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(@RequestBody Person person) { - person.setOprationId(permissionService.getCurrLoginUser().getId()); - personService.updateById(person); - return ResponseData.success(); + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + personService.updateById(person); + return ResponseData.success(); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + return ResponseData.error("人员编码重复"); + } } /** diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml index 295c59a..9bb8912 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml @@ -19,7 +19,7 @@ a.ID AS id, a.DELFLAG AS delflag, a.CREATETIME AS createtime, a.UPDATETIME AS updatetime, a.NAME AS name, a.SEX AS sex, a.DEPTID AS deptid, a.ID_CARD_NO AS idCard, a.REMARKS AS remarks, a.PERSON_TYPE AS personType - ,a.DUTY + ,a.DUTY,a.NATION,a.BIRTHDAY,a.OPRATION_ID as oprationId diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java index 362678c..78fbd5f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java @@ -3,13 +3,14 @@ import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotations.*; import com.baomidou.mybatisplus.enums.IdType; -import com.casic.missiles.core.annotations.MetaData; import com.casic.missiles.core.annotations.MetaDataBean; +import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.core.base.model.DataMetaModel; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.sql.Timestamp; import java.util.Date; /** @@ -31,14 +32,15 @@ /** * 状态(0：有效 1：删除） */ - @TableLogic - @TableField("DELFLAG") + + @TableLogic(delval = "1") private String delflag; /** * 创建时间 */ - @TableField("CREATETIME") - private Date createtime; + @TableField(value = "CREATETIME") + @JSONField(serializeUsing = DateDeserializer.class) + private Timestamp createtime; /** * 修改时间 */ @@ -81,6 +83,10 @@ private String personCode; @TableField("OPRATION_ID") private Long oprationId; + private String duty; + private String nation; + private Date birthday; + //人员编码 @TableField(exist = false) private String deptName; @@ -90,6 +96,10 @@ private String sexName; @TableField(exist = false) private String oprationName; + @TableField(exist = false) + private String dutyName; + @TableField(exist = false) + private String nationName; @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java index a672344..a90eb1d 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.annotations.MetaData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.enums.MetaTypeEnums; +import com.casic.missiles.core.enums.MetaEnums; import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.PersonMapper; @@ -38,6 +38,12 @@ return super.selectList(wrapper); } + @Transactional + @Override + public boolean updateById(@MetaData(type = MetaEnums.UPDATE) Person entity) { + return super.updateById(entity); + } + @MetaData @Override public Page selectPage(Page page, Wrapper wrapper) { @@ -46,13 +52,13 @@ @Transactional @Override - public boolean insert(@MetaData(type = MetaTypeEnums.INSERT) Person entity) { + public boolean insert(@MetaData(type = MetaEnums.INSERT) Person entity) { //查询最大人员编码 if (ToolUtil.isEmpty(entity.getPersonCode())) { String currDay = DateUtil.getDays(); String personCode = this.selectMaxPersonCode(entity.getPersonType(), currDay); String code = PersonTypeEnums.typeOf(entity.getPersonType()).getCode(); - String prefix = ToolUtil.isEmpty(code)?personPrefix:code; + String prefix = ToolUtil.isEmpty(code) ? personPrefix : code; personCode = personCode.replaceAll(prefix, ""); if (!"0".equals(personCode)) { personCode = personCode.substring(8); @@ -62,24 +68,15 @@ return super.insert(entity); } - @Transactional - @Override - public boolean updateById(@MetaData(type = MetaTypeEnums.UPDATE) Person entity) { - return super.updateById(entity); - } - @Override public String selectMaxPersonCode(String personType, String currDay) { return baseMapper.selectMaxPersonCode(personType, currDay); } + @MetaData @Override public List selectDataScopePerson(Page page, DataScope dataScope, EntityWrapper wrapper) { - return baseMapper.selectDataScopePerson(page,dataScope,wrapper); - } - - public static void main(String[] args) { - System.out.println(PersonTypeEnums.valueOf("1")); + return baseMapper.selectDataScopePerson(page, dataScope, wrapper); } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 11ccdf3..73ecf80 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -13,6 +13,10 @@ kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload +mybatis-plus: + global-config: + sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject +# logic-delete-value: 0 logging: level.root: info level.com.casic: debug diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java index fc7f86b..c41d777 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IPersonService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,8 +35,16 @@ */ @GetMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(personService.selectList(null)); + public Object list(String deptId, String personType) { + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) { + query.eq("DEPTID", deptId); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq("PERSON_TYPE", personType); + } + query.eq("DELFLAG", 0); + return ResponseData.success(personService.selectList(query)); } /** @@ -43,12 +52,21 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String sex, String duty, String deptId) { + public Object listPage(String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt("a.CREATETIME", startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt("a.CREATETIME", endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq("a.PERSON_TYPE", personType); + } - if(ToolUtil.isNotEmpty(duty)){ - query.eq("a.DUTY",duty); + if (ToolUtil.isNotEmpty(duty)) { + query.eq("a.DUTY", duty); } if (ToolUtil.isNotEmpty(deptId)) { query.eq("a.DEPTID", deptId); @@ -57,18 +75,21 @@ query.eq("a.SEX", sex); } query.eq("a.DELFLAG", 0); - if(ToolUtil.isNotEmpty(keywords)){ - query.andNew().like("a.NAME",keywords).or().like("a.ID_CARD_NO",keywords); + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like("a.NAME", keywords).or().like("a.ID_CARD_NO", keywords); } - List scopePersons = personService.selectDataScopePerson(page,permissionService.getCurrUserDataScope(), query); + + List scopePersons = personService.selectDataScopePerson(page, permissionService.getCurrUserDataScope(), query); page.setRecords(scopePersons); + query.orderBy("a.person_code"); //展示数据封装 page.getRecords().forEach(person -> { person.setDeptName(permissionService.getDeptName(person.getDeptid())); person.setSexName(permissionService.getDictNameByCode("sysSex", person.getSex())); person.setPersonTypeName(permissionService.getDictNameByCode("personType", person.getSex())); + person.setDutyName(permissionService.getDictNameByCode("dutyType", person.getDuty())); + person.setNationName(permissionService.getDictNameByCode("nationType", person.getNation())); }); - return ResponseData.success(super.packForBT(page)); } @@ -78,8 +99,14 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(@RequestBody Person person) { - person.setOprationId(permissionService.getCurrLoginUser().getId()); - return ResponseData.success(personService.insert(person)); + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + return ResponseData.success(personService.insert(person)); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + return ResponseData.error("人员编码重复"); + } + } /** @@ -108,9 +135,14 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(@RequestBody Person person) { - person.setOprationId(permissionService.getCurrLoginUser().getId()); - personService.updateById(person); - return ResponseData.success(); + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + personService.updateById(person); + return ResponseData.success(); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + return ResponseData.error("人员编码重复"); + } } /** diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml index 295c59a..9bb8912 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml @@ -19,7 +19,7 @@ a.ID AS id, a.DELFLAG AS delflag, a.CREATETIME AS createtime, a.UPDATETIME AS updatetime, a.NAME AS name, a.SEX AS sex, a.DEPTID AS deptid, a.ID_CARD_NO AS idCard, a.REMARKS AS remarks, a.PERSON_TYPE AS personType - ,a.DUTY + ,a.DUTY,a.NATION,a.BIRTHDAY,a.OPRATION_ID as oprationId