From 1e870450ad7de5ef6cc92ab1d619c7f213e4e3c8 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 6 Dec 2024 18:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/jarRepositories.xml | 15 +++++++++++++++ .../impl/ExperimentalAppServiceImpl.java | 2 +- .../aqgqj/basis/dao/ExperimentalMapper.java | 16 ++++++++++++++++ .../service/impl/ExperimentalServiceImpl.java | 19 ++++++++++++++++++- .../resources/mappers/app/HomeAppMapper.xml | 2 ++ .../mappers/basis/ExperimentalMapper.xml | 12 ++++++++++++ .../resources/mappers/basis/HomeMapper.xml | 2 ++ src/main/resources/static/js/exper/device.js | 2 +- .../pages/basic/standard/child/testForm.html | 2 +- .../basic/tools/child/addTestStandards.html | 2 +- .../basic/tools/child/checkTestStandards.html | 2 +- .../static/pages/exper/deviceAddForm.html | 2 +- 12 files changed, 71 insertions(+), 7 deletions(-) diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index b074d70..ce6c24e 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,6 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java index 779d2fa..51dbbe4 100644 --- a/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java @@ -182,7 +182,7 @@ public class ExperimentalAppServiceImpl implements ExperimentalAppService { } BigDecimal nowMony = new BigDecimal("0"); BigDecimal amount= new BigDecimal(experDevVo.getAmount()); - nowMony.add(devMony).add(amount); + nowMony=nowMony.add(devMony).add(amount); //计算设备总金额 experDevVo.setExperAmount(nowMony.toString()); allMony=allMony.add(nowMony); diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java b/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java index cf44683..5f2f8ea 100644 --- a/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java +++ b/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java @@ -461,4 +461,20 @@ public interface ExperimentalMapper { * @return OperationRecordDto */ OperationRecordDto getOperationRecord(ParamsDto data); + + /** + * 查询设备名称 + * @param devName + * @return + */ + int getExperDevNumByName(String devName); + + /** + *插入数据 + * @param devName + * @param devModule + * @param devCode + * @param time + */ + void insertExperDev(@Param("devName") String devName, @Param("devModule")String devModule,@Param("devCode") String devCode,@Param("time") String time); } diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java index 06494f2..0cca37d 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java @@ -17,6 +17,7 @@ import com.bonus.aqgqj.webResult.HttpStatus; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -150,6 +151,7 @@ public class ExperimentalServiceImpl implements ExperimentalService { BigDecimal allMony = new BigDecimal("0"); // 添加试验信息数据 mapper.addExper(vo); + insertExperDev(vo.getExperDev(),vo.getExperModule(),vo.getExperCode(),vo.getCheckTime()); // 添加试验依据信息数据 mapper.addConfigBasis(vo.getBasisVos(), vo.getId()); //试验项金额 @@ -172,7 +174,7 @@ public class ExperimentalServiceImpl implements ExperimentalService { //计算设备总金额 BigDecimal amount= new BigDecimal(experDevVo.getAmount()); BigDecimal nowMony= new BigDecimal("0"); - nowMony.add(amount).add(devMony); + nowMony=nowMony.add(amount).add(devMony); experDevVo.setExperAmount(nowMony.toString()); allMony=allMony.add(nowMony); mapper.addExperDev(experDevVo, vo.getId()); @@ -202,6 +204,20 @@ public class ExperimentalServiceImpl implements ExperimentalService { return ServerResponse.createBySuccessMsg("操作成功"); } + + @Async + public void insertExperDev(String devName,String devModule,String devCode,String time){ + try{ + int num=mapper.getExperDevNumByName(devName); + if(num<1){ + mapper.insertExperDev(devName,devModule,devCode,time); + } + }catch (Exception e){ + log.error(e.toString(),e); + } + + } + @Override @Transactional(rollbackFor = Exception.class) public ServerResponse editTestData(TestVo vo) { @@ -260,6 +276,7 @@ public class ExperimentalServiceImpl implements ExperimentalService { } // 修改试验信息数据 mapper.updateExper(vo); + insertExperDev(vo.getExperDev(),vo.getExperModule(),vo.getExperCode(),vo.getCheckTime()); // 添加试验依据信息数据 mapper.addConfigBasis(vo.getBasisVos(), vo.getId()); for (int i = 0; i < vo.getExperDevVos().size(); i++) { diff --git a/src/main/resources/mappers/app/HomeAppMapper.xml b/src/main/resources/mappers/app/HomeAppMapper.xml index 7669b1b..985d3bc 100644 --- a/src/main/resources/mappers/app/HomeAppMapper.xml +++ b/src/main/resources/mappers/app/HomeAppMapper.xml @@ -41,6 +41,8 @@ tb_team tt ON ts.team_id = tt.id WHERE ts.del_flag = '0') aa GROUP BY teamName + order by testCost desc + limit 5 + + + + insert into tb_exper_device(dev_name, dev_module, dev_code, + contract_date, create_time, data_source, + del_flag) + values (#{devName}, #{devModule}, #{devCode}, #{time}, now(), 1, 0) + diff --git a/src/main/resources/mappers/basis/HomeMapper.xml b/src/main/resources/mappers/basis/HomeMapper.xml index 0c5a2dd..875f587 100644 --- a/src/main/resources/mappers/basis/HomeMapper.xml +++ b/src/main/resources/mappers/basis/HomeMapper.xml @@ -34,6 +34,8 @@ left join tb_team tt on ts.team_id=tt.id where ts.del_flag='0' ) aa group by teamName + order by testCost desc + limit 5 diff --git a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html index feb6b67..722742b 100644 --- a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html +++ b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html @@ -126,7 +126,7 @@
- +
diff --git a/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html b/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html index 951a4b1..1a18b71 100644 --- a/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html +++ b/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html @@ -124,7 +124,7 @@
- +
diff --git a/src/main/resources/static/pages/exper/deviceAddForm.html b/src/main/resources/static/pages/exper/deviceAddForm.html index 91a0425..5355eb9 100644 --- a/src/main/resources/static/pages/exper/deviceAddForm.html +++ b/src/main/resources/static/pages/exper/deviceAddForm.html @@ -40,7 +40,7 @@
- +