diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/controller/PrepaymentController.java b/src/main/java/com/bonus/boot/manager/ca/bm/controller/PrepaymentController.java index 42b67c6..97868a7 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/controller/PrepaymentController.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/controller/PrepaymentController.java @@ -2,15 +2,19 @@ package com.bonus.boot.manager.ca.bm.controller; import com.bonus.boot.manager.ca.bm.entity.GoodsInfoBean; import com.bonus.boot.manager.ca.bm.entity.OperationsBean; +import com.bonus.boot.manager.ca.bm.entity.PayAccountInfoBean; import com.bonus.boot.manager.ca.bm.entity.PrepaymentBean; import com.bonus.boot.manager.ca.bm.service.PrepaymentService; import com.bonus.boot.manager.manager.annotation.LogAnnotation; import com.bonus.boot.manager.manager.entity.R; import com.bonus.boot.manager.manager.model.SysUser; +import com.bonus.boot.manager.manager.table.PageTableHandler; import com.bonus.boot.manager.manager.table.PageTableRequest; +import com.bonus.boot.manager.manager.table.PageTableResponse; import com.bonus.boot.manager.manager.utils.AjaxRes; import com.bonus.boot.manager.manager.utils.GlobalConst; import com.bonus.boot.manager.manager.utils.UserUtil; +import com.bonus.boot.manager.tools.entity.ToolsBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,7 +45,6 @@ public class PrepaymentController { @PostMapping("/getList") @ApiOperation(value = "查询") -// @PreAuthorize("hasAuthority('sys:prepayment:query')") public R getList(PageTableRequest request) { List list = service.getList(request.getParams(), request.getOffset(), request.getLimit()); return list.size() > 0 ? R.okTable(list, list.size()):R.failTable("暂无数据"); @@ -50,7 +53,6 @@ public class PrepaymentController { @RequestMapping(value = "addPrepayment", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "工程预付款统计-新增") -// @PreAuthorize("hasAuthority('sys:payable:add')") public AjaxRes addPrepayment(@RequestBody PrepaymentBean prepaymentBean) { AjaxRes ar = new AjaxRes(); int i = service.addPrepayment(prepaymentBean); @@ -81,7 +83,6 @@ public class PrepaymentController { @RequestMapping(value = "updatePrepayment", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "工程预付款统计-修改") -// @PreAuthorize("hasAuthority('sys:payable:add')") public AjaxRes updatePrepayment(@RequestBody PrepaymentBean bean) { AjaxRes ar = new AjaxRes(); int i = service.updatePrepayment(bean); @@ -96,7 +97,6 @@ public class PrepaymentController { @LogAnnotation @DeleteMapping("/delPrepayment/{id}") @ApiOperation(value = "工程预付款统计-删除") -// @PreAuthorize("hasAuthority('sys:goods:del')") public void delPrepayment(@PathVariable Long id) { service.delPrepayment(id); } @@ -105,7 +105,6 @@ public class PrepaymentController { @RequestMapping(value = "addOperations", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "工程预付款统计-数据更新-新增") -// @PreAuthorize("hasAuthority('sys:payable:add')") public AjaxRes addOperations(@RequestBody OperationsBean bean) { AjaxRes ar = new AjaxRes(); int i = service.addOperations(bean); @@ -122,7 +121,6 @@ public class PrepaymentController { @RequestMapping(value = "updateOperations", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "工程预付款统计-数据更新-修改") -// @PreAuthorize("hasAuthority('sys:payable:add')") public AjaxRes updateOperations(@RequestBody OperationsBean bean) { AjaxRes ar = new AjaxRes(); int i = service.updateOperations(bean); @@ -153,7 +151,6 @@ public class PrepaymentController { @LogAnnotation @DeleteMapping("/delOperations/{id}") @ApiOperation(value = "工程预付款统计-数据更新-删除") -// @PreAuthorize("hasAuthority('sys:goods:del')") public void delOperations(@PathVariable Long id) { service.delOperations(id); } @@ -163,7 +160,6 @@ public class PrepaymentController { @PostMapping("/getOperationsList") @ApiOperation(value = "数据更新-查询") -// @PreAuthorize("hasAuthority('sys:prepayment:query')") public R getOperationsList(PageTableRequest request) { List list = service.getOperationsList(request.getParams(), request.getOffset(), request.getLimit()); return list.size() > 0 ? R.okTable(list, list.size()):R.failTable("暂无数据"); @@ -181,4 +177,63 @@ public class PrepaymentController { service.expOperations(response,request.getParams()); } +// @GetMapping("/getDictList") +// @ApiOperation(value = "查询") +// public R getDictList(PageTableRequest request) { +// List list = service.getDictList(request.getParams(), request.getOffset(), request.getLimit()); +// return list.size() > 0 ? R.okTable(list, list.size()):R.failTable("暂无数据"); +// } + + @GetMapping("/getDictList") + @ApiOperation(value = "查询") + public PageTableResponse getDictList(PageTableRequest request) { + return new PageTableHandler(new PageTableHandler.CountHandler() { + @Override + public int count(PageTableRequest request) { + return service.getDictCount(request.getParams()); + } + }, new PageTableHandler.ListHandler() { + @Override + public List list(PageTableRequest request) { + List list = service.getDictList(request.getParams(), request.getOffset(), request.getLimit()); + return list; + } + }).handle(request); + } + + @LogAnnotation + @GetMapping("/{id}") + @ApiOperation(value = "根据id获取内容") + public PrepaymentBean getById(@PathVariable Long id) { + return service.getById(id); + } + + @LogAnnotation + @PostMapping("/addOrUpdate") + @ApiOperation(value = "保存信息") + public void addOrUpdate(@RequestBody PrepaymentBean o) { + service.addOrUpdate(o); + } + + @LogAnnotation + @DeleteMapping("/delDict/{id}") + @ApiOperation(value = "删除信息") + public void delDict(@PathVariable Long id) { + service.delDict(id); + } + + + @LogAnnotation + @GetMapping("/getBusinessUnit") + @ApiOperation(value = "责任单位下拉选") + public List getBusinessUnit() { + return service.getBusinessUnit(); + } + + @LogAnnotation + @GetMapping("/getType") + @ApiOperation(value = "预付款类型下拉选") + public List getType() { + return service.getType(); + } } diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/dao/PrepaymentDao.java b/src/main/java/com/bonus/boot/manager/ca/bm/dao/PrepaymentDao.java index 4a1a325..79f9f19 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/dao/PrepaymentDao.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/dao/PrepaymentDao.java @@ -2,6 +2,7 @@ package com.bonus.boot.manager.ca.bm.dao; import com.bonus.boot.manager.ca.bm.entity.OperationsBean; import com.bonus.boot.manager.ca.bm.entity.PrepaymentBean; +import com.bonus.boot.manager.tools.entity.ToolsBean; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -47,4 +48,22 @@ public interface PrepaymentDao { * @return */ OperationsBean getOperationsById(String id); + + List getDictList(@Param("params") Map params, @Param("offset") Integer offset, @Param("limit") Integer limit); + + PrepaymentBean getById(Long id); + + void update(PrepaymentBean o); + + void add(PrepaymentBean o); + + void delDict(Long id); + + int getDictCount(@Param("params") Map params); + + int getByIdDict(Long id); + + List getBusinessUnit(); + + List getType(); } diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/entity/PrepaymentBean.java b/src/main/java/com/bonus/boot/manager/ca/bm/entity/PrepaymentBean.java index 17f09f4..ebef3ad 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/entity/PrepaymentBean.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/entity/PrepaymentBean.java @@ -12,10 +12,13 @@ import java.math.BigDecimal; @Data public class PrepaymentBean { private String id; + private String name; private String projectCode;//承揽合同编码 private String projectName;//承揽合同名称（工程名称） + private String businessUnitId;//责任单位 private String businessUnit;//责任单位 private String contactUnit;//往来单位 + private String typeId;//预付款类型 private String type;//预付款类型 @JsonSerialize(using = ToStringSerializer.class) diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/service/PrepaymentService.java b/src/main/java/com/bonus/boot/manager/ca/bm/service/PrepaymentService.java index dcccdb7..78da902 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/service/PrepaymentService.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/service/PrepaymentService.java @@ -2,6 +2,7 @@ package com.bonus.boot.manager.ca.bm.service; import com.bonus.boot.manager.ca.bm.entity.OperationsBean; import com.bonus.boot.manager.ca.bm.entity.PrepaymentBean; +import com.bonus.boot.manager.tools.entity.ToolsBean; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -101,4 +102,25 @@ public interface PrepaymentService { * @param params */ void expOperations(HttpServletResponse response, Map params); + + /** + * 查询字典表 + * @param params + * @param offset + * @param limit + * @return + */ + List getDictList(Map params, Integer offset, Integer limit); + + PrepaymentBean getById(Long id); + + void addOrUpdate(PrepaymentBean o); + + void delDict(Long id); + + int getDictCount(Map params); + + List getBusinessUnit(); + + List getType(); } diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java b/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java index a1305b8..0b389fa 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java @@ -6,7 +6,9 @@ import com.bonus.boot.manager.ca.bm.dao.PrepaymentDao; import com.bonus.boot.manager.ca.bm.entity.OperationsBean; import com.bonus.boot.manager.ca.bm.entity.PrepaymentBean; import com.bonus.boot.manager.ca.bm.service.PrepaymentService; +import com.bonus.boot.manager.manager.entity.LoginUser; import com.bonus.boot.manager.manager.utils.UserUtil; +import com.bonus.boot.manager.tools.entity.ToolsBean; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -327,4 +329,48 @@ public class PrepaymentServiceImpl implements PrepaymentService { writer.close(); IoUtil.close(out); } + + @Override + public List getDictList(Map params, Integer offset, Integer limit) { + return dao.getDictList(params,offset,limit); + } + + @Override + public PrepaymentBean getById(Long id) { + return dao.getById(id); + } + + @Override + public void addOrUpdate(PrepaymentBean o) { + if (o.getId() != null && !o.getId().isEmpty()){ + dao.update(o); + }else { + dao.add(o); + } + } + + @Override + public void delDict(Long id) { + int i = dao.getByIdDict(id); + if(i>0){ + throw new IllegalArgumentException("该类别已存在，不可删除"); + }else{ + dao.delDict(id); + } + } + + @Override + public int getDictCount(Map params) { + return dao.getDictCount(params); + } + + @Override + public List getBusinessUnit() { + return dao.getBusinessUnit(); + } + + @Override + public List getType() { + return dao.getType(); + } } diff --git a/src/main/resources/mappers/ca/PrepaymentMapper.xml b/src/main/resources/mappers/ca/PrepaymentMapper.xml index d6704a6..d54c61c 100644 --- a/src/main/resources/mappers/ca/PrepaymentMapper.xml +++ b/src/main/resources/mappers/ca/PrepaymentMapper.xml @@ -27,6 +27,12 @@ #{handler}, #{nextRemarks}, '1', #{operator},#{currentBalance}) + + + INSERT INTO `bm_project_prepayment_dict` ( `name`, `remarks`, `type` ) + VALUES ( #{name}, #{remarks}, #{type} ) + + UPDATE `bm_project_prepayment` SET `current_balance` = #{currentBalanceNew}, @@ -85,6 +91,10 @@ WHERE `id` = #{id} and is_active = '1' + + UPDATE `bm_project_prepayment_dict` SET `name` = #{name}, `remarks` = #{remarks}, `type` = #{type} WHERE `id` = #{id} + + UPDATE `bm_project_prepayment` SET `is_active` = '0', @@ -99,14 +109,20 @@ WHERE `id` = #{id} + + UPDATE `bm_project_prepayment_dict` SET `is_active` = '0' WHERE `id` = #{id} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/prepayment/addOperations.js b/src/main/resources/static/js/prepayment/addOperations.js index 5166b2f..8721cb2 100644 --- a/src/main/resources/static/js/prepayment/addOperations.js +++ b/src/main/resources/static/js/prepayment/addOperations.js @@ -26,11 +26,11 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function(){ // min: previousMonth, // 最小可选月份为上个月 max: currentDate, // 最大可选月份为当前月份 done: function(value, date) { - if(value < previousMonth){ + /*if(value < previousMonth){ layer.msg('只能选择上个月或当月', {icon: 5}); $("#month").val("") return; - } + }*/ } }); diff --git a/src/main/resources/static/js/prepayment/addPro.js b/src/main/resources/static/js/prepayment/addPro.js index 960dfec..ab58cbc 100644 --- a/src/main/resources/static/js/prepayment/addPro.js +++ b/src/main/resources/static/js/prepayment/addPro.js @@ -9,6 +9,8 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function(){ elem: '#firstPaymentDate', max: getToday(), }); + getBusinessUnit(""); + getType(""); initData(); form.render(); // 自定义验证规则 @@ -38,9 +40,9 @@ function initData(){ $("#id").val(info.id); $("#projectCode").val(info.projectCode); $("#projectName").val(info.projectName); - $("#businessUnit").val(info.businessUnit); + $("#businessUnit").val(info.businessUnitId); $("#contactUnit").val(info.contactUnit); - $("#type").val(info.type); + $("#type").val(info.typeId); $("#initialAmount").val(info.initialAmount); @@ -106,4 +108,52 @@ function add(formData) { top.layer.close(addLoadingMsg); //再执行关闭 } }); +} + +function getBusinessUnit(id){ + $("#businessUnit").empty(); + $.ajax({ + url: ctxPath + '/prepayment/getBusinessUnit', + method: 'get', + async: false, + success: function (data) { + var str = ''; + if (data.length > 0) { + str += ''; + for (var i = 0; i < data.length; i++) { + if (id == data[i].id) { + str += ''; + } else { + str += ''; + } + } + } + $("#businessUnit").append(str); + layui.form.render('select') + } + }) +} + +function getType(id){ + $("#type").empty(); + $.ajax({ + url: ctxPath + '/prepayment/getType', + method: 'get', + async: false, + success: function (data) { + var str = ''; + if (data.length > 0) { + str += ''; + for (var i = 0; i < data.length; i++) { + if (id == data[i].id) { + str += ''; + } else { + str += ''; + } + } + } + $("#type").append(str); + layui.form.render('select') + } + }) } \ No newline at end of file diff --git a/src/main/resources/static/pages/prepayment/addPro.html b/src/main/resources/static/pages/prepayment/addPro.html index da9a859..5cc762c 100644 --- a/src/main/resources/static/pages/prepayment/addPro.html +++ b/src/main/resources/static/pages/prepayment/addPro.html @@ -22,6 +22,10 @@ color: #333; /* 字体颜色 */ border-color: #ddd; /* 边框颜色 */ } + + .layui-input, .layui-textarea{ + width: 89%; + } @@ -30,54 +34,60 @@
- +
- +
- + +
- +
- + +
- +
- +
- +
diff --git a/src/main/resources/static/pages/prepayment/proDictForm.html b/src/main/resources/static/pages/prepayment/proDictForm.html new file mode 100644 index 0000000..8a23c6d --- /dev/null +++ b/src/main/resources/static/pages/prepayment/proDictForm.html @@ -0,0 +1,172 @@ + + + + + + + + + + + +
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/pages/prepayment/proDictList.html b/src/main/resources/static/pages/prepayment/proDictList.html new file mode 100644 index 0000000..1d1d84e --- /dev/null +++ b/src/main/resources/static/pages/prepayment/proDictList.html @@ -0,0 +1,274 @@ + + + + + 工程预付款统计-字典列表信息 + + + + + + + +
+
+
+
+ + + + +
+
+
+
+
+ +
+
+
+ +
+ + +
+
+
+
+
+ +
+
+ + + + + + + + + + + + +
序号类别名称备注操作
+
+
+
+
+ + + + + + + + + + + + + \ No newline at end of file