From 37ee96565a154959c26a2cdb23138f7ad0adcdf6 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 25 Jul 2024 19:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E5=91=8A=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SamplesManageController.java | 17 +++- .../aqgqj/basis/dao/SamplesManageDao.java | 8 ++ .../aqgqj/basis/dao/TestReportManageDao.java | 14 +++ .../basis/entity/dto/SamplesManageDto.java | 5 + .../basis/entity/dto/TestReportManageDto.java | 16 +++ .../basis/service/SamplesManageService.java | 8 ++ .../impl/SamplesManageServiceImpl.java | 10 ++ .../impl/TestReportManageServiceImpl.java | 52 +++++++++- .../java/com/bonus/aqgqj/model/SysUser.java | 5 + .../system/service/impl/UserServiceImpl.java | 11 ++- .../mappers/basis/SamplesManageMapper.xml | 18 +++- .../mappers/basis/TestReportManageMapper.xml | 98 ++++++++++++------- .../resources/mappers/system/UserMapper.xml | 21 +++- .../static/js/samples/child/samplesAdd.js | 63 +++--------- src/main/resources/static/js/select.js | 57 ++++++++++- .../static/js/system/child/userForm.js | 14 ++- .../js/testReport/child/testReportForm.js | 20 +++- .../pages/samples/child/samplesAdd.html | 23 +++-- .../static/pages/user/child/userForm.html | 14 ++- .../resources/static/pages/user/userMge.html | 4 +- 20 files changed, 357 insertions(+), 121 deletions(-) diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/SamplesManageController.java b/src/main/java/com/bonus/aqgqj/basis/controller/SamplesManageController.java index bbed682..046770f 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/SamplesManageController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/SamplesManageController.java @@ -4,6 +4,7 @@ import com.bonus.aqgqj.annotation.DecryptAndVerify; import com.bonus.aqgqj.annotation.LogAnnotation; import com.bonus.aqgqj.basis.entity.dto.SamplesManageDto; import com.bonus.aqgqj.basis.entity.dto.SamplesManageDto; +import com.bonus.aqgqj.basis.entity.dto.ToolsManageDto; import com.bonus.aqgqj.basis.service.SamplesManageService; import com.bonus.aqgqj.basis.service.ToolsManageService; import com.bonus.aqgqj.system.vo.EncryptedReq; @@ -100,7 +101,7 @@ public class SamplesManageController { * @description 新增收样数据 */ @PostMapping("addSamples") - @DecryptAndVerify(decryptedClass = SamplesManageDto.class)//加解密统一管理 + @DecryptAndVerify(decryptedClass = SamplesManageDto.class) @LogAnnotation(operModul = "收样管理", operation = "新增收样数据", operDesc = "业务级事件", operType = "新增") @PreAuthorize("@pms.hasPermission('sys:samples:add')") public ServerResponse addSamples(EncryptedReq vo) { @@ -141,5 +142,19 @@ public class SamplesManageController { } } + @PostMapping(value = "getDeptSelectedById") + @DecryptAndVerify(decryptedClass = SamplesManageDto.class) + @LogAnnotation(operModul = "收样管理", operation = "根据单位id获取部门", operDesc = "业务级事件",operType="查询") + @PreAuthorize("@pms.hasPermission('sys:tools:query')" ) + public ServerResponse getDeptSelectedById(EncryptedReq data) { + try { + List list = samplesManageService.getDeptSelectedById(data.getData()); + return ServerResponse.createSuccess(list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + } diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/SamplesManageDao.java b/src/main/java/com/bonus/aqgqj/basis/dao/SamplesManageDao.java index ea6a29d..250da01 100644 --- a/src/main/java/com/bonus/aqgqj/basis/dao/SamplesManageDao.java +++ b/src/main/java/com/bonus/aqgqj/basis/dao/SamplesManageDao.java @@ -1,6 +1,7 @@ package com.bonus.aqgqj.basis.dao; import com.bonus.aqgqj.basis.entity.dto.SamplesManageDto; +import com.bonus.aqgqj.basis.entity.dto.ToolsManageDto; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -81,4 +82,11 @@ public interface SamplesManageDao { * @return */ int updateTeamId(SamplesManageDto dto); + + /** + * 获取部门 + * @param data + * @return + */ + List getDeptSelectedById(SamplesManageDto data); } diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/TestReportManageDao.java b/src/main/java/com/bonus/aqgqj/basis/dao/TestReportManageDao.java index 69c64cb..709caef 100644 --- a/src/main/java/com/bonus/aqgqj/basis/dao/TestReportManageDao.java +++ b/src/main/java/com/bonus/aqgqj/basis/dao/TestReportManageDao.java @@ -81,4 +81,18 @@ public interface TestReportManageDao { * @return */ int updateTeamId(TestReportManageDto dto); + + /** + * 获取当前年月 报告编号 + * @param nowDate + * @return + */ + String getReportCode(String nowDate); + + /** + * 修改报告编号 + * @param dto + * @return + */ + int updateReportCode(TestReportManageDto dto); } diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/dto/SamplesManageDto.java b/src/main/java/com/bonus/aqgqj/basis/entity/dto/SamplesManageDto.java index 549a3bf..16cb9fa 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/dto/SamplesManageDto.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/dto/SamplesManageDto.java @@ -31,6 +31,11 @@ public class SamplesManageDto extends PageEntity { */ private String customName; + /** + * 部门id + */ + private Integer departmentId; + /** * 送样部门 */ diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/dto/TestReportManageDto.java b/src/main/java/com/bonus/aqgqj/basis/entity/dto/TestReportManageDto.java index 48d24c4..0b45926 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/dto/TestReportManageDto.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/dto/TestReportManageDto.java @@ -148,5 +148,21 @@ public class TestReportManageDto extends PageEntity { */ private Integer devNum; + /** + * 报告编号 + */ + private String reportCode; + + /** + * 是否合格 + */ + private String isHg; + + /** + * 检测时间 + */ + private String detectionTime; + + } diff --git a/src/main/java/com/bonus/aqgqj/basis/service/SamplesManageService.java b/src/main/java/com/bonus/aqgqj/basis/service/SamplesManageService.java index 36e602d..3d79ac4 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/SamplesManageService.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/SamplesManageService.java @@ -1,6 +1,7 @@ package com.bonus.aqgqj.basis.service; import com.bonus.aqgqj.basis.entity.dto.SamplesManageDto; +import com.bonus.aqgqj.basis.entity.dto.ToolsManageDto; import com.bonus.aqgqj.utils.ServerResponse; import java.util.List; @@ -55,4 +56,11 @@ public interface SamplesManageService { * @return */ ServerResponse dispatchWork(SamplesManageDto data); + + /** + * 根据单位Id获取部门列表 + * @param data + * @return + */ + List getDeptSelectedById(SamplesManageDto data); } diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/SamplesManageServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/SamplesManageServiceImpl.java index 61b49d7..30fbce3 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/SamplesManageServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/SamplesManageServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.bonus.aqgqj.basis.dao.SamplesManageDao; import com.bonus.aqgqj.basis.dao.ToolsManageDao; import com.bonus.aqgqj.basis.entity.dto.SamplesManageDto; +import com.bonus.aqgqj.basis.entity.dto.ToolsManageDto; import com.bonus.aqgqj.basis.service.SamplesManageService; import com.bonus.aqgqj.basis.service.ToolsManageService; import com.bonus.aqgqj.utils.DateTimeHelper; @@ -121,6 +122,15 @@ public class SamplesManageServiceImpl implements SamplesManageService { return samplesManageDao.getTeamSelected(); } + /** + * 根据单位Id获取部门列表 + */ + @Override + public List getDeptSelectedById(SamplesManageDto data) { + List list = samplesManageDao.getDeptSelectedById(data); + return list; + } + @Override @Transactional(rollbackFor = Exception.class) public ServerResponse dispatchWork(SamplesManageDto data) { diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java index 30c7752..5fe7f65 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java @@ -38,10 +38,10 @@ public class TestReportManageServiceImpl implements TestReportManageService { @Override public List list(TestReportManageDto bean) { List list = testReportManageDao.list(bean); - for (TestReportManageDto dto : list){ - String sampleTools = testReportManageDao.getSampleTools(dto.getId()); - dto.setSampleTools(sampleTools); - } +// for (TestReportManageDto dto : list){ +// String sampleTools = testReportManageDao.getSampleTools(dto.getId()); +// dto.setSampleTools(sampleTools); +// } return list; } @@ -52,7 +52,49 @@ public class TestReportManageServiceImpl implements TestReportManageService { */ @Override public List getDetailsList(TestReportManageDto data) { - return testReportManageDao.getDetailsList(data); + List list = testReportManageDao.getDetailsList(data); + //如果没有报告编号，需要生成报告编号 + for (TestReportManageDto dto : list){ + if (StringHelper.isEmpty(dto.getReportCode())){ + //生成报告编号 + String reportCode = generateReportCode(dto); + dto.setReportCode(reportCode); + } + } + return list; + } + + /** + * 生成报告编号 + * 报告编号生成规则：ML/BG-YYYY-MMNNN-DD-QQ + *  ML/BG:明丽/报告 + *  YYYY：年份（4位数字），表示报告生成的年份 + *  MM：月份（2位数字），表示报告生成的月份 + *  NNN：报告序号，每个月从001开始，递增生成。每月的序号重新计数。 + *  DD：部门的随机排序（2位数字），每个部门内部的随机编号 + *  QQ：数量（2位数字），表示报告中设备的数量 + * @param dto + * @return + */ + private String generateReportCode(TestReportManageDto dto) { + //获取当前年 yyyy + String nowYear = DateTimeHelper.getNowYear(); + //获取当前月 MM + String nowMonth = DateTimeHelper.getNowMonths(); + //查询当前年月的序号 + String code = testReportManageDao.getReportCode(nowYear+"-"+nowMonth); + if (StringHelper.isNotEmpty(code)){ + int num = Integer.parseInt(code); + num++; + code = "ML/BG-"+nowYear+"-"+nowMonth+String.format("%03d",num)+"-00-"+String.format("%02d",dto.getDevNum()); + + }else { + code = "ML/BG-"+nowYear+"-"+nowMonth+"001"+"-00-"+String.format("%02d",dto.getDevNum()); + } + //将生成的报告编号保存到数据库 + dto.setReportCode(code); + int res = testReportManageDao.updateReportCode(dto); + return code; } @Override diff --git a/src/main/java/com/bonus/aqgqj/model/SysUser.java b/src/main/java/com/bonus/aqgqj/model/SysUser.java index e797c9d..33363be 100644 --- a/src/main/java/com/bonus/aqgqj/model/SysUser.java +++ b/src/main/java/com/bonus/aqgqj/model/SysUser.java @@ -116,6 +116,11 @@ public class SysUser extends PageEntity { /**班组ID*/ private String teamId; + /** + * 班组名称 + */ + private String teamName; + public interface Status { int DISABLED = 0; diff --git a/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java index cbfdecb..7dc155e 100644 --- a/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java @@ -102,7 +102,16 @@ public class UserServiceImpl implements UserService { */ @Override public List list(SysUser user) { - return userDao.list(user); + List list = userDao.list(user); + if (list.size()>0){ + for (SysUser users : list){ + //如果班组为不空，则拼接；否则只展示组织 + if (StringHelper.isNotEmpty(users.getTeamName())){ + users.setOrgName(users.getOrgName()+"/"+users.getTeamName()); + } + } + } + return list; } /** diff --git a/src/main/resources/mappers/basis/SamplesManageMapper.xml b/src/main/resources/mappers/basis/SamplesManageMapper.xml index 86cbf3d..cd6a0b3 100644 --- a/src/main/resources/mappers/basis/SamplesManageMapper.xml +++ b/src/main/resources/mappers/basis/SamplesManageMapper.xml @@ -4,7 +4,6 @@ INSERT INTO tb_sample(custom_id, custom_name, - department, sample_user, sample_time, create_time, @@ -12,7 +11,6 @@ sample_date) VALUES (#{customId}, #{customName}, - #{sampleDepartment}, #{sampleUser}, #{sampleTime}, NOW(), @@ -26,6 +24,7 @@ dev_module, dev_code, customer_code, + department_id, sample_time, create_time, create_user) @@ -35,6 +34,7 @@ #{devModule}, #{devCode}, #{customerCode}, + #{departmentId}, #{sampleTime}, NOW(), #{createBy}) @@ -84,16 +84,17 @@ AND tsd.del_falg = '0') aa @@ -152,4 +153,11 @@ FROM tb_team WHERE del_flag = 0 + \ No newline at end of file diff --git a/src/main/resources/mappers/basis/TestReportManageMapper.xml b/src/main/resources/mappers/basis/TestReportManageMapper.xml index 0c3fd98..99a2f2d 100644 --- a/src/main/resources/mappers/basis/TestReportManageMapper.xml +++ b/src/main/resources/mappers/basis/TestReportManageMapper.xml @@ -44,49 +44,58 @@ SET team_id = #{teamId} WHERE id = #{id} + + INSERT INTO tb_certificate + (`code`, `exper_id`, `dev_type`, `is_hg`, `department`, `create_time`) + values (#{reportCode}, + #{id}, + #{sampleTools}, + #{isHg}, + #{sampleDepartment}, + NOW()) + + \ No newline at end of file diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml index e768f0e..cec15c2 100644 --- a/src/main/resources/mappers/system/UserMapper.xml +++ b/src/main/resources/mappers/system/UserMapper.xml @@ -42,9 +42,19 @@ - insert into sys_user(login_name, user_name, user_code, sex, org_id, role_id, phone, user_type, state, password,team_id,create_time) - values (#{loginName}, #{username}, #{userCode}, #{sex}, #{orgId}, #{roleId}, #{phone}, #{userType}, #{state}, - #{password},#{teamId},NOW()) + insert into sys_user(login_name, user_name, user_code, sex, org_id,login_type, role_id, phone, user_type, state, + password, + + team_id, + + create_time) + values (#{loginName}, #{username}, #{userCode}, #{sex}, #{orgId},#{loginType}, #{roleId}, #{phone}, #{userType}, + #{state}, + #{password}, + + #{teamId}, + + NOW()) + -
- -
- -
-
+
@@ -92,14 +87,22 @@ - -
+
+ +
+ + + +
+
+
diff --git a/src/main/resources/static/pages/user/child/userForm.html b/src/main/resources/static/pages/user/child/userForm.html index 59ef370..ab8da55 100644 --- a/src/main/resources/static/pages/user/child/userForm.html +++ b/src/main/resources/static/pages/user/child/userForm.html @@ -60,9 +60,9 @@
- +
-
@@ -92,6 +92,16 @@ +
+ +
+ + + + +
+
+
diff --git a/src/main/resources/static/pages/user/userMge.html b/src/main/resources/static/pages/user/userMge.html index 29371a7..318b361 100644 --- a/src/main/resources/static/pages/user/userMge.html +++ b/src/main/resources/static/pages/user/userMge.html @@ -50,8 +50,8 @@
- + +