From 3552d8c310a4aeecbdb6c23320438aa043e1e407 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 16 Mar 2023 09:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=87=BA=E5=BA=93=E6=97=B6=EF=BC=8C=E4=BB=93=E5=82=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=83=A8=E9=97=A8=E5=8F=AF=E4=BB=A5=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=83=A8=E9=97=A8=E3=80=81=E6=96=BD=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepositoryRecordController.java | 29 +++++++++++ .../controller/PageController.java | 18 ++++++- .../entity/ApplicationOutRecordMin.java | 10 ++++ .../mapper/DepositoryRecordMapper.xml | 48 ++++++++++++++++--- .../pojo/ApplicationOutRecordMinP.java | 22 +++++++++ .../pojo/ApplicationOutRecordP.java | 13 +++++ .../service/impl/CompanyServiceImpl.java | 4 +- .../utils/LinkInterfaceUtil.java | 6 +-- .../form-step-look_minRecordOut.html | 11 +++++ .../application-out.html | 24 +++++----- .../mapper/DepositoryRecordMapper.xml | 48 ++++++++++++++++--- .../form-step-look_minRecordOut.html | 11 +++++ 12 files changed, 213 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 2eeed749..0aecbf42 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -466,6 +466,15 @@ public class DepositoryRecordController { map.remove("id"); map.put("parentId", id); } + String constructionUnitId = map.get("constructionUnitId").toString(); + String adminorgId = map.get("adminorgId").toString(); + if("".equals(constructionUnitId)) + { + map.remove("constructionUnitId"); + } + if("".equals(adminorgId)){ + map.put("adminorgId",userToken.getMaindeparment()); + } integer += depositoryRecordService.insertApplicationOutMin(map); // 开启一个线程执行发送信息操作 @@ -533,9 +542,29 @@ public class DepositoryRecordController { insert.put("unit", map.get("unit" + temp)); // 获取主订单编号 insert.put("parentId", id); + String constructionUnitId = (String) map.get("constructionUnitId"+temp); + String adminorgId = (String) map.get("adminorgId"+temp); + if(!"".equals(constructionUnitId)) + { + insert.put("constructionUnitId",constructionUnitId); + } + if("".equals(adminorgId)){ + map.put("adminorgId",userToken.getMaindeparment()); + }else{ + map.put("adminorgId",adminorgId); + } // 插入子订单 integer += depositoryRecordService.insertApplicationOutMin(insert); } + String constructionUnitId = map.get("constructionUnitId").toString(); + String adminorgId = map.get("adminorgId").toString(); + if("".equals(constructionUnitId)) + { + map.remove("constructionUnitId"); + } + if("".equals(adminorgId)){ + map.put("adminorgId",userToken.getMaindeparment()); + } // 插入子订单 map.put("parentId", id); map.remove("id"); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index bbf94f0d..fd0098c7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1820,6 +1820,22 @@ public class PageController { Place placeById = placeService.findPlaceById(recordMin.getPlaceId()); // 获取处理人 UserByPort userByPort = LinkInterfaceUtil.FindUserById(recordMin.getCheckId(), userToken); + + if(recordMinP.getAdminorgId() != null){ + Administration company = LinkInterfaceUtil.getCompany(recordMinP.getAdminorgId(), userToken); + recordMinP.setAdminorgName(company.getName()); + mv.addObject("adisplay", "table-row"); + }else{ + mv.addObject("adisplay", "none"); + } + if(recordMinP.getConstructionUnitId() != null){ + ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(recordMinP.getConstructionUnitId()); + recordMinP.setConstructionUnitName(constructionUnitById.getName()); + mv.addObject("cdisplay", "table-row"); + }else{ + mv.addObject("cdisplay", "none"); + } + // 设置处理人姓名 recordMinP.setCheckerName(userByPort.getName()); recordMinP.setDepositoryName(depository.getDname()); @@ -1904,7 +1920,7 @@ public class PageController { List recordMinPList = new ArrayList<>(); // 当前总额 - Double sumPrice = 0.0; + double sumPrice = 0.0; for (ApplicationOutRecordMin applicationOutRecordMin : applicationOutRecordMinByParent) { // 获取子订单信息 // 获取输出子订单信息 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java index ffa20552..d9ff9d34 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java @@ -69,4 +69,14 @@ public class ApplicationOutRecordMin { */ private String mname; + + /** + * 施工单位id + */ + private Integer constructionUnitId; + + /** + * 部门id + */ + private Integer adminorgId; } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 595399c3..2dd16719 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -113,7 +113,8 @@ - + + @@ -129,6 +130,8 @@ + + @@ -166,11 +169,12 @@ aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, - depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit + depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aormconstructionunitid,aormadminorgid,cuname, + cuintroduce,cuaddress - aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit + aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.constructionunitid,aorm.adminorgid @@ -882,6 +904,12 @@ and istransfer = #{istransfer} + + and adminorgid = #{adminorgid} + + + and constructionunitid = #{constructionunitid} + @@ -1037,7 +1065,7 @@ - insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit) + insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,constructionunitid,adminorgid) values( #{id}, #{mid}, @@ -1049,7 +1077,9 @@ #{parentId}, #{transferId}, #{trueOut}, - #{unit} + #{unit}, + #{constructionUnitId}, + #{adminorgId} ) @@ -1309,7 +1339,13 @@ parentId = #{parentId}, - trueOut = #{trueOut} + trueOut = #{trueOut}, + + + adminorgid = #{adminorgid}, + + + constructionunitid = #{constructionunitid} where id = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java index d1b92d16..ee88b34f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java @@ -101,6 +101,26 @@ public class ApplicationOutRecordMinP { */ private Integer transferId; + /** + * 施工单位id + */ + private Integer constructionUnitId; + + /** + * 施工单位名称 + */ + private String constructionUnitName; + + /** + * 部门id + */ + private Integer adminorgId; + + + /** + * 部门名称 + */ + private String adminorgName; @@ -116,5 +136,7 @@ public class ApplicationOutRecordMinP { this.placeId = recordMin.getPlaceId(); this.unit = recordMin.getUnit(); this.transferId = recordMin.getTransferId(); + this.constructionUnitId = recordMin.getConstructionUnitId(); + this.adminorgId = recordMin.getAdminorgId(); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java index 42660ba6..efaf25e9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java @@ -149,4 +149,17 @@ public class ApplicationOutRecordP { * 出库单位 */ private String unit; + + /** + * 施工单位id + */ + private Integer constructionUnitId; + /** + * 施工单位名称 + */ + private String constructionUnitName; + /** + * 部门id + */ + private Integer adminorgId; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java index 71a5b48b..26a9a1b0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java @@ -373,7 +373,7 @@ public class CompanyServiceImpl implements CompanyService { */ public Map buildTree(JSONObject jsonObject,List children){ Map node = new HashMap<>(); - node.put("id",jsonObject.getInteger("id")); + node.put("id",jsonObject.getString("id")); node.put("title",jsonObject.getString("name")); node.put("children",children); node.put("wechatorganizationid",jsonObject.getInteger("wechatorganizationid")); @@ -387,7 +387,7 @@ public class CompanyServiceImpl implements CompanyService { */ public Map buildTree(ConstructionUnit constructionUnit){ Map node = new HashMap<>(); - node.put("id",constructionUnit.getId()); + node.put("id",constructionUnit.getId().toString()); node.put("title",constructionUnit.getName()); return node; } diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java index 86e2bb9c..a85b0169 100644 --- a/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java +++ b/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java @@ -73,8 +73,7 @@ public class LinkInterfaceUtil { } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); - UserByPort userByPort = JSONObject.toJavaObject(data, UserByPort.class); - return userByPort; + return JSONObject.toJavaObject(data, UserByPort.class); } /** @@ -98,8 +97,7 @@ public class LinkInterfaceUtil { } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); - Administration administration = JSONObject.toJavaObject(data, Administration.class); - return administration; + return JSONObject.toJavaObject(data, Administration.class); } /** diff --git a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html index 60a371a5..1114e7af 100644 --- a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html +++ b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html @@ -66,6 +66,16 @@ 转入位置 2016-11-28 + + 部门 + 外芯仓库 + + + + 施工单位 + 外芯仓库 + + 出库人员 @@ -73,6 +83,7 @@ + diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html index 67ef9df9..033300cf 100644 --- a/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html +++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html @@ -133,8 +133,8 @@ readonly id="openCompanyAdminorg" onclick="selectPost(this)" - lay-verify="required"/> - + @@ -146,7 +146,7 @@ readonly id="openConstructionUnit" onclick="selectConstructionUnit(this)" - lay-verify="required"/> + /> @@ -249,8 +249,8 @@ readonly id="openCompanyAdminorgForGroup" onclick="selectPost(this)" - lay-verify="required"/> - + @@ -262,7 +262,7 @@ readonly id="openConstructionUnitForGroup" onclick="selectConstructionUnit(this)" - lay-verify="required"/> + /> @@ -631,8 +631,8 @@ readonly id=`+"openCompanyAdminorg"+NewIdNumber+` onclick="selectPost(this)" - lay-verify="required"/> - + @@ -644,7 +644,7 @@ readonly id=`+"openConstructionUnit"+NewIdNumber+` onclick="selectConstructionUnit(this)" - lay-verify="required"/> + /> @@ -718,8 +718,8 @@ readonly id=`+"openCompanyAdminorgForGroup"+NewIdNumber+` onclick="selectPost(this)" - lay-verify="required"/> - + @@ -731,7 +731,7 @@ readonly id=`+"openConstructionUnitForGroup"+NewIdNumber+` onclick="selectConstructionUnit(this)" - lay-verify="required"/> + /> diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 595399c3..2dd16719 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -113,7 +113,8 @@ - + + @@ -129,6 +130,8 @@ + + @@ -166,11 +169,12 @@ aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, - depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit + depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aormconstructionunitid,aormadminorgid,cuname, + cuintroduce,cuaddress - aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit + aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.constructionunitid,aorm.adminorgid @@ -882,6 +904,12 @@ and istransfer = #{istransfer} + + and adminorgid = #{adminorgid} + + + and constructionunitid = #{constructionunitid} + @@ -1037,7 +1065,7 @@ - insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit) + insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,constructionunitid,adminorgid) values( #{id}, #{mid}, @@ -1049,7 +1077,9 @@ #{parentId}, #{transferId}, #{trueOut}, - #{unit} + #{unit}, + #{constructionUnitId}, + #{adminorgId} ) @@ -1309,7 +1339,13 @@ parentId = #{parentId}, - trueOut = #{trueOut} + trueOut = #{trueOut}, + + + adminorgid = #{adminorgid}, + + + constructionunitid = #{constructionunitid} where id = #{id} diff --git a/target/classes/templates/pages/application/form-step-look_minRecordOut.html b/target/classes/templates/pages/application/form-step-look_minRecordOut.html index 60a371a5..1114e7af 100644 --- a/target/classes/templates/pages/application/form-step-look_minRecordOut.html +++ b/target/classes/templates/pages/application/form-step-look_minRecordOut.html @@ -66,6 +66,16 @@ 转入位置 2016-11-28 + + 部门 + 外芯仓库 + + + + 施工单位 + 外芯仓库 + + 出库人员 @@ -73,6 +83,7 @@ +