diff --git a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ListSafeDto.java b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ListSafeDto.java new file mode 100644 index 0000000..0be56ee --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ListSafeDto.java @@ -0,0 +1,35 @@ +package com.rzyc.bean.user.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author dong + * @date 2023-12-26 14:01 + * @Version V1.0 + */ +@ApiModel("职责清单") +public class ListSafeDto { + + @ApiModelProperty(value = "岗位id",required = true) + private String listperformId; + + @ApiModelProperty("关键字") + private String condition; + + public String getListperformId() { + return listperformId; + } + + public void setListperformId(String listperformId) { + this.listperformId = listperformId; + } + + public String getCondition() { + return condition; + } + + public void setCondition(String condition) { + this.condition = condition; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListSafeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListSafeMapper.java index 6ec91e1..04bcffd 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListSafeMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListSafeMapper.java @@ -39,7 +39,8 @@ public interface ListSafeMapper { int updateByPrimaryKey(ListSafe record); /*用户职责*/ - List userListSafe(@Param("listPerformId") String listPerformId); + List userListSafe(@Param("listPerformId") String listPerformId, + @Param("condition") String condition); /*查询部门局长的职责*/ List othListSafe(@Param("supClassId") String supClassId); diff --git a/inventory-dao/src/main/java/com/rzyc/model/user/ListSafe.java b/inventory-dao/src/main/java/com/rzyc/model/user/ListSafe.java index fbb4bb2..c4e4c29 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/user/ListSafe.java +++ b/inventory-dao/src/main/java/com/rzyc/model/user/ListSafe.java @@ -1,5 +1,6 @@ package com.rzyc.model.user; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,10 +33,12 @@ public class ListSafe implements Serializable { private Date applydate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createdon; private String createdby; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date modifiedon; private String modifiedby; diff --git a/inventory-dao/src/main/resources/mapper/user/ListSafeMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListSafeMapper.xml index 350f07c..45dadb8 100644 --- a/inventory-dao/src/main/resources/mapper/user/ListSafeMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/ListSafeMapper.xml @@ -417,7 +417,11 @@ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java b/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java index a42733b..75c4775 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java @@ -70,7 +70,7 @@ public class ImportController extends com.rzyc.controller.BaseController { @ApiOperation(value = "导入新兴行业职责", notes = "导入新兴行业职责") @RequestMapping(value = "/risingData", method = RequestMethod.POST) @ResponseBody - public SingleResult risingData(@RequestBody MultipartFile multipartFile)throws Exception{ + public SingleResult risingData(@RequestBody MultipartFile multipartFile,Integer cellNum)throws Exception{ SingleResult result = new SingleResult<>(); Workbook wookbook = WorkbookFactory.create(multipartFile.getInputStream()); Sheet sheet = wookbook.getSheetAt(0); @@ -99,7 +99,7 @@ public class ImportController extends com.rzyc.controller.BaseController { Cell cell = row.getCell((short)1); - for (int j = 1;j<=13;j++){ + for (int j = 1;j<=cellNum;j++){ cell = row.getCell((short)j); String str = dataFormatter.formatCellValue(cell); str = StringUtils.replaceBlank(str); @@ -125,7 +125,7 @@ public class ImportController extends com.rzyc.controller.BaseController { System.out.println("unitName ----> "+unitName); ListPerform perform = listPerformMapper.findByName(unitName,"5bd164aa-dd43-45e3-a5a2-649bb2fd9fb9"); if(null != perform){ - for (int k = 1;k<=13;k++){ + for (int k = 1;k<=cellNum;k++){ cell = row.getCell((short)k); String listStr = dataFormatter.formatCellValue(cell); listStr = StringUtils.replaceBlank(listStr); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index 019c5b8..83903ef 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -502,7 +502,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { MultiResult result = new MultiResult<>(); SysUser sysUser = sysUserMapper.selectByPrimaryKey(userId); if(null != sysUser && StringUtils.isNotBlank(sysUser.getSystitle())){ - List listSafes = listSafeMapper.userListSafe(sysUser.getSystitle()); + List listSafes = listSafeMapper.userListSafe(sysUser.getSystitle(),""); if(null != listSafes && listSafes.size() > 0){ result.setData(listSafes); }else{ @@ -2094,7 +2094,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { @ResponseBody public MultiResult performSafe(String listperformId)throws Exception{ MultiResult result = new MultiResult<>(); - List listSafes = listSafeMapper.userListSafe(listperformId); + List listSafes = listSafeMapper.userListSafe(listperformId,""); if(listSafes.size() > 0){ Integer sortId = 1; for (ListSafeWithBLOBs listSafe : listSafes){ @@ -2111,6 +2111,27 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { return result; } + /** + * 岗位安全生产职责清单分页 + * @version v1.0 + * @author dong + * @date 2023/12/26 14:11 + */ + @LoginAuth + @ApiOperation(value = "岗位安全生产职责清单分页", notes = "岗位安全生产职责清单分页") + @GetMapping(value = "performSafePage") + @ResponseBody + public SingleResult> performSafePage(@Valid ListSafeDto listSafeDto,@Valid PageDto pageDto)throws Exception{ + SingleResult> result = new SingleResult<>(); + String condition = TypeConversion.getConditionV1(listSafeDto.getCondition()); + PageHelper.startPage(pageDto.getPage(), pageDto.getPageSize()); + Page page = (Page)listSafeMapper.userListSafe(listSafeDto.getListperformId(),condition); + Pager pager = new Pager<>(); + getDatePage(pager,page); + result.setData(pager); + return result; + } + /** * 修改新增安全生产职责清单 diff --git a/inventory-gov/src/main/java/com/rzyc/controller/WxContorller.java b/inventory-gov/src/main/java/com/rzyc/controller/WxContorller.java index c65439c..60a1acb 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/WxContorller.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/WxContorller.java @@ -595,7 +595,7 @@ public class WxContorller extends com.rzyc.controller.BaseController { MultiResult result = new MultiResult<>(); SysUser sysUser = sysUserMapper.selectByPrimaryKey(userId); if(null != sysUser && StringUtils.isNotBlank(sysUser.getSystitle())){ - List userListSafe = listSafeMapper.userListSafe(sysUser.getSystitle()); + List userListSafe = listSafeMapper.userListSafe(sysUser.getSystitle(),""); result.setData(userListSafe); } return result; diff --git a/utils/src/main/java/com/common/utils/TypeConversion.java b/utils/src/main/java/com/common/utils/TypeConversion.java index 0d4eaf0..c598cb1 100644 --- a/utils/src/main/java/com/common/utils/TypeConversion.java +++ b/utils/src/main/java/com/common/utils/TypeConversion.java @@ -20,7 +20,7 @@ import java.text.SimpleDateFormat; * */ public class TypeConversion { - + /** * String 类型 装换成 Long 类型 * @param v1 @@ -33,7 +33,7 @@ public class TypeConversion { } return result; } - + /** * String 类型 装换成 Integer 类型 * @param v1 @@ -46,7 +46,7 @@ public class TypeConversion { } return result; } - + /** * String 类型 装换成 Double 类型 * @param v1 @@ -59,7 +59,7 @@ public class TypeConversion { } return result; } - + /** * Timestamp 转 String * @param t1 @@ -67,10 +67,10 @@ public class TypeConversion { * @return */ public static String timestampToString(Timestamp t1,String patten){ - DateFormat sdf = new SimpleDateFormat(patten); - return sdf.format(t1); + DateFormat sdf = new SimpleDateFormat(patten); + return sdf.format(t1); } - + /** * InputStream 转 byte []数组 * @param in @@ -86,7 +86,7 @@ public class TypeConversion { } return output.toByteArray(); } - + /** * Url 转 InputStream * @param fileUrl @@ -94,16 +94,16 @@ public class TypeConversion { * @throws Exception */ public static InputStream urlToInputStream(String fileUrl,InputStream is)throws Exception{ - URL url = new URL(fileUrl); - HttpURLConnection conn = (HttpURLConnection) url.openConnection();//利用HttpURLConnection对象,我们可以从网络中获取网页数据. + URL url = new URL(fileUrl); + HttpURLConnection conn = (HttpURLConnection) url.openConnection();//利用HttpURLConnection对象,我们可以从网络中获取网页数据. System.out.println(conn.getContentLength());; - conn.connect(); - is = conn.getInputStream(); //得到网络返回的输入流 + conn.connect(); + is = conn.getInputStream(); //得到网络返回的输入流 return is; } - + /** - * 格式化小数 + * 格式化小数 * @param decimal 要格式化的小数 * @param num 保留到小数点后多少位 * @return @@ -132,6 +132,21 @@ public class TypeConversion { return condition; } + /** + * 处理字符串 在字符串前面和后面加 % 号 + * @param condition + * @return + * @throws Exception + */ + public static String getConditionV1(String condition) { + if (StringUtils.isNotBlank(condition)) { + condition = condition.replace(" ",""); + condition = condition.replace("\t",""); + condition = "%" + condition + "%"; + } + return condition; + } + /** - listToTree