diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index da4aee84..d315f3f4 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: ruoyi/uploadPath + profile: D:\ruoyi\uploadPath # 获取ip地址开关 addressEnabled: false @@ -98,7 +98,7 @@ shiro: # 首页地址 indexUrl: /index # 验证码开关 - captchaEnabled: true + captchaEnabled: false # 验证码类型 math 数字计算 char 字符验证 captchaType: math cookie: diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html index 7d82de79..23f57717 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html index 2b4a5d91..29f50cda 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html @@ -7,6 +7,7 @@
+

合同档案信息

@@ -85,17 +86,25 @@
- +
- + +
+
+ + + +
+
- +
- + +
@@ -143,7 +152,42 @@ $.operate.save(prefix + "/edit", $('#form-order-edit').serialize()); } } - + function selectDeptTree() { + var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val(); + console.log(deptId) + var url = ctx + "system/user/selectDeptTree/" + deptId; + var options = { + title: '选择部门', + width: "380", + url: url, + callBack: doSubmit + }; + $.modal.openOptions(options); + } + function doSubmit(index, layero){ + var body = $.modal.getChildFrame(index); + $("#treeId").val(body.find('#treeId').val()); + $("#treeName").val(body.find('#treeName').val()); + $.modal.close(index); + } + function selectDeptTreePartener() { + var deptId = $.common.isEmpty($("#treeId1").val()) ? "100" : $("#treeId1").val(); + console.log(deptId) + var url = ctx + "system/user/selectDeptTree/" + deptId; + var options = { + title: '选择部门', + width: "380", + url: url, + callBack: doSubmitPartener + }; + $.modal.openOptions(options); + } + function doSubmitPartener(index, layero){ + var body = $.modal.getChildFrame(index); + $("#treeId1").val(body.find('#treeId').val()); + $("#treeName1").val(body.find('#treeName').val()); + $.modal.close(index); + } $("input[name='orderDate']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java index 5ea2f8d1..1254649b 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java @@ -76,26 +76,28 @@ public class OrderInfoServiceImpl implements IOrderInfoService @Override public int updateOrderInfo(OrderInfo orderInfo) { - List orderListList = orderInfo.getOrderListList(); - Map> operateMap = - orderListList.stream().collect(Collectors.groupingBy(OrderList::getOperateFlag)); - //新增 - List addList = operateMap.get("0"); - if (addList!=null && !addList.isEmpty()){ - orderInfoMapper.batchOrderList(addList); - } - //更新 - List updateList = operateMap.get("1"); - if (updateList!=null && !updateList.isEmpty()){ - - orderInfoMapper.updateListBatch(updateList); - } - //删除 - List deleteList = operateMap.get("2"); - if (deleteList!=null && !deleteList.isEmpty()){ - - orderInfoMapper.logicRemoveListById(deleteList); - } +// List orderListList = orderInfo.getOrderListList(); +// Map> operateMap = +// orderListList.stream().collect(Collectors.groupingBy(OrderList::getOperateFlag)); +// //新增 +// List addList = operateMap.get("0"); +// if (addList!=null && !addList.isEmpty()){ +// orderInfoMapper.batchOrderList(addList); +// } +// //更新 +// List updateList = operateMap.get("1"); +// if (updateList!=null && !updateList.isEmpty()){ +// +// orderInfoMapper.updateListBatch(updateList); +// } +// //删除 +// List deleteList = operateMap.get("2"); +// if (deleteList!=null && !deleteList.isEmpty()){ +// +// orderInfoMapper.logicRemoveListById(deleteList); +// } + orderInfoMapper.deleteOrderListByOrderId(orderInfo.getId()); + insertOrderList(orderInfo); return orderInfoMapper.updateOrderInfo(orderInfo); } diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 2620aeaa..b6ae7040 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -96,11 +96,11 @@ t1.created_at, t1. updated_at, t1.deleted_at, - t2.dept_name, - t3.dept_name + t2.dept_name as order_dept_name, + t3.dept_name as partener_dept_name from order_info t1 left join sys_dept t2 on t1.order_dept = t2.dept_id - left join sys_dept t3 on t1.partener_dept = t2.dept_id + left join sys_dept t3 on t1.partener_dept = t3.dept_id where t1.id = #{id} @@ -245,11 +245,10 @@ - insert into order_list( id, order_id, product_code, quantity, price, amount, remark, created_at, updated_at, - deleted_at) values + insert into order_list( id, order_id, product_code, quantity, price, amount, remark, created_at, updated_at) values ( #{item.id}, #{item.orderId}, #{item.productCode}, #{item.quantity}, #{item.price}, #{item.amount}, - #{item.remark}, #{item.createdAt}, #{item.updatedAt}, #{item.deletedAt}) + #{item.remark}, now(),now())