Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
4a03ad02 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 b4b75dce 371d14dd
内嵌 并排
正在显示 8 个修改的文件 包含 68 行增加 和 52 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/DistributContractController.java
...@@ -83,10 +83,7 @@ public class DistributContractController { ...@@ -83,10 +83,7 @@ public class DistributContractController {
83 HttpServletRequest req) { 83 HttpServletRequest req) {
84 Result<List<DistributContract>> result = new Result<List<DistributContract>>(); 84 Result<List<DistributContract>> result = new Result<List<DistributContract>>();
85 QueryWrapper<DistributContract> queryWrapper = QueryGenerator.initQueryWrapper(distributContract, req.getParameterMap()); 85 QueryWrapper<DistributContract> queryWrapper = QueryGenerator.initQueryWrapper(distributContract, req.getParameterMap());
86
87 // 需要添加条件判断 86 // 需要添加条件判断
88 queryWrapper.eq("status" , "3");// 审核通过
89
90 List<DistributContract> dataList = distributContractService.list(queryWrapper); 87 List<DistributContract> dataList = distributContractService.list(queryWrapper);
91 result.setSuccess(true); 88 result.setSuccess(true);
92 result.setResult(dataList); 89 result.setResult(dataList);
...@@ -109,7 +106,6 @@ public class DistributContractController { ...@@ -109,7 +106,6 @@ public class DistributContractController {
109 result.success("添加成功！"); 106 result.success("添加成功！");
110 } 107 }
111 } 108 }
112
113 } catch (Exception e) { 109 } catch (Exception e) {
114 log.error(e.getMessage(),e); 110 log.error(e.getMessage(),e);
115 result.error500("操作失败"); 111 result.error500("操作失败");
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialAcceptanceFormController.java
...@@ -136,7 +136,7 @@ public class MaterialAcceptanceFormController { ...@@ -136,7 +136,7 @@ public class MaterialAcceptanceFormController {
136 if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign())){ 136 if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign())){
137 materialAcceptanceForm.setConfirmStatus("2"); 137 materialAcceptanceForm.setConfirmStatus("2");
138 } 138 }
139 if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign()) ){ 139 if(StringUtils.isNotEmpty(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotEmpty(materialAcceptanceForm.getReceiverSign()) ){
140 materialAcceptanceForm.setConfirmStatus("9"); 140 materialAcceptanceForm.setConfirmStatus("9");
141 } 141 }
142 MaterialAcceptanceForm materialAcceptanceFormEntity = materialAcceptanceFormService.getById(materialAcceptanceForm.getId()); 142 MaterialAcceptanceForm materialAcceptanceFormEntity = materialAcceptanceFormService.getById(materialAcceptanceForm.getId());
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
...@@ -32,7 +32,9 @@ import com.skua.modules.erp.util.PdfUtil; ...@@ -32,7 +32,9 @@ import com.skua.modules.erp.util.PdfUtil;
32 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO; 32 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO;
33 import com.skua.modules.erp.vo.MaterialINVO; 33 import com.skua.modules.erp.vo.MaterialINVO;
34 import com.skua.modules.supplies.entity.EquipmentSparepartSupplies; 34 import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
35 import com.skua.modules.supplies.entity.EquipmentSparepartType;
35 import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesService; 36 import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesService;
37 import com.skua.modules.supplies.service.IEquipmentSparepartTypeService;
36 import com.skua.modules.system.entity.SysDepart; 38 import com.skua.modules.system.entity.SysDepart;
37 import com.skua.modules.system.service.ISysDepartService; 39 import com.skua.modules.system.service.ISysDepartService;
38 import lombok.extern.slf4j.Slf4j; 40 import lombok.extern.slf4j.Slf4j;
...@@ -81,6 +83,8 @@ public class MaterialINController { ...@@ -81,6 +83,8 @@ public class MaterialINController {
81 private ISysDepartService departService; 83 private ISysDepartService departService;
82 @Autowired 84 @Autowired
83 private IMaterialAcceptanceFormService materialAcceptanceFormService;//验收单 85 private IMaterialAcceptanceFormService materialAcceptanceFormService;//验收单
86 @Autowired
87 private IEquipmentSparepartTypeService sparepartTypeService;
84 /** 88 /**
85 * <pre> 89 * <pre>
86 * 分页列表查询 90 * 分页列表查询
...@@ -102,10 +106,10 @@ public class MaterialINController { ...@@ -102,10 +106,10 @@ public class MaterialINController {
102 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 106 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
103 HttpServletRequest req) { 107 HttpServletRequest req) {
104 Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>(); 108 Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>();
105 QueryWrapper<MaterialIN> queryWrapper = new QueryWrapper();// QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap()); 109 QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
106 Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize); 110 Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize);
107 111
108 if(StringUtils.isNotBlank(materialIN.getDepartId())){ 112 /*if(StringUtils.isNotBlank(materialIN.getDepartId())){
109 queryWrapper.eq("depart_id",materialIN.getDepartId()); 113 queryWrapper.eq("depart_id",materialIN.getDepartId());
110 } 114 }
111 if(StringUtils.isNotBlank(materialIN.getAuditStatus())){ 115 if(StringUtils.isNotBlank(materialIN.getAuditStatus())){
...@@ -122,8 +126,8 @@ public class MaterialINController { ...@@ -122,8 +126,8 @@ public class MaterialINController {
122 } 126 }
123 if(StringUtils.isNotBlank(materialIN.getEndTime())){ 127 if(StringUtils.isNotBlank(materialIN.getEndTime())){
124 queryWrapper.le("arrive_time",materialIN.getEndTime()); 128 queryWrapper.le("arrive_time",materialIN.getEndTime());
125 } 129 }*/
126 130 queryWrapper.orderByDesc("arrive_time");
127 IPage<MaterialIN> pageList = materialINService.page(page, queryWrapper); 131 IPage<MaterialIN> pageList = materialINService.page(page, queryWrapper);
128 result.setSuccess(true); 132 result.setSuccess(true);
129 result.setResult(pageList); 133 result.setResult(pageList);
...@@ -137,17 +141,17 @@ public class MaterialINController { ...@@ -137,17 +141,17 @@ public class MaterialINController {
137 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 141 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
138 HttpServletRequest req) { 142 HttpServletRequest req) {
139 Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>(); 143 Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>();
140 QueryWrapper<MaterialIN> queryWrapper = new QueryWrapper();//QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap()); 144 QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
141 Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize); 145 Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize);
142 if(StringUtils.isNotBlank(materialIN.getDepartId())){ 146 /*if(StringUtils.isNotBlank(materialIN.getDepartId())){
143 queryWrapper.eq("depart_id",materialIN.getDepartId()); 147 queryWrapper.eq("depart_id",materialIN.getDepartId());
144 } 148 }
145 if(StringUtils.isNotBlank(materialIN.getAuditStatus())){ 149 if(StringUtils.isNotBlank(materialIN.getAuditStatus())){
146 queryWrapper.eq("audit_status",materialIN.getAuditStatus()); 150 queryWrapper.eq("audit_status",materialIN.getAuditStatus());
147 } 151 }
148 /*if(StringUtils.isNotBlank(materialIN.getConfirmStatus())){ 152 *//*if(StringUtils.isNotBlank(materialIN.getConfirmStatus())){
149 queryWrapper.eq("confirm_status",materialIN.getConfirmStatus()); 153 queryWrapper.eq("confirm_status",materialIN.getConfirmStatus());
150 }*/ 154 }*//*
151 if(StringUtils.isNotBlank(materialIN.getGoodCode())){ 155 if(StringUtils.isNotBlank(materialIN.getGoodCode())){
152 queryWrapper.like("good_code",materialIN.getGoodCode()); 156 queryWrapper.like("good_code",materialIN.getGoodCode());
153 } 157 }
...@@ -156,14 +160,16 @@ public class MaterialINController { ...@@ -156,14 +160,16 @@ public class MaterialINController {
156 } 160 }
157 if(StringUtils.isNotBlank(materialIN.getEndTime())){ 161 if(StringUtils.isNotBlank(materialIN.getEndTime())){
158 queryWrapper.le("arrive_time",materialIN.getEndTime()); 162 queryWrapper.le("arrive_time",materialIN.getEndTime());
159 } 163 }*/
160 164
161 // 需要添加条件判断 165 // 需要添加条件判断
162 queryWrapper.gt("status" , "0");// >0 166 if(StringUtils.isEmpty(materialIN.getAuditStatus())){
163 queryWrapper.ne("status" , "2"); // 不等于2 167 queryWrapper.gt("audit_status" , "0");// >0
164 168 queryWrapper.ne("audit_status" , "2"); // 不等于2
165 169 }
166 queryWrapper.eq("confirm_status","2"); 170 queryWrapper.eq("confirm_status","2");
171
172 queryWrapper.orderByDesc("arrive_time");
167 IPage<MaterialIN> pageList = materialINService.page(page, queryWrapper); 173 IPage<MaterialIN> pageList = materialINService.page(page, queryWrapper);
168 result.setSuccess(true); 174 result.setSuccess(true);
169 result.setResult(pageList); 175 result.setResult(pageList);
...@@ -196,6 +202,7 @@ public class MaterialINController { ...@@ -196,6 +202,7 @@ public class MaterialINController {
196 } 202 }
197 queryWrapper.eq("audit_status","3"); 203 queryWrapper.eq("audit_status","3");
198 List<MaterialIN> pageList = materialINService.list( queryWrapper);*/ 204 List<MaterialIN> pageList = materialINService.list( queryWrapper);*/
205
199 List<ArrivalRecordExcelExportVO> pageList = materialINService.queryArrivalRecordByList(materialIN); 206 List<ArrivalRecordExcelExportVO> pageList = materialINService.queryArrivalRecordByList(materialIN);
200 207
201 result.setSuccess(true); 208 result.setSuccess(true);
...@@ -329,6 +336,11 @@ public class MaterialINController { ...@@ -329,6 +336,11 @@ public class MaterialINController {
329 public Result<MaterialIN> queryById(@RequestParam(name="id",required=true) String id) { 336 public Result<MaterialIN> queryById(@RequestParam(name="id",required=true) String id) {
330 Result<MaterialIN> result = new Result<MaterialIN>(); 337 Result<MaterialIN> result = new Result<MaterialIN>();
331 MaterialIN materialIN = materialINService.getById(id); 338 MaterialIN materialIN = materialINService.getById(id);
339
340 EquipmentSparepartType sparepartType = sparepartTypeService.getById(materialIN.getSparepartType());
341 if(sparepartType != null ){
342 materialIN.setSparepartTypeName( sparepartType.getItemText() );
343 }
332 if(materialIN==null) { 344 if(materialIN==null) {
333 result.error500("未找到对应实体"); 345 result.error500("未找到对应实体");
334 }else { 346 }else {
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseContractController.java
1 package com.skua.modules.erp.controller; 1 package com.skua.modules.erp.controller;
2 2
3 import java.util.Arrays; 3 import java.util.*;
4 import java.util.List;
5 4
6 import javax.servlet.http.HttpServletRequest; 5 import javax.servlet.http.HttpServletRequest;
7 6
...@@ -17,6 +16,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -17,6 +16,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
17 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 16 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
18 import com.skua.modules.erp.vo.PurchaseContractVO; 17 import com.skua.modules.erp.vo.PurchaseContractVO;
19 import lombok.extern.slf4j.Slf4j; 18 import lombok.extern.slf4j.Slf4j;
19 import org.apache.commons.lang3.StringUtils;
20 import org.springframework.beans.factory.annotation.Autowired; 20 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.web.bind.annotation.*; 21 import org.springframework.web.bind.annotation.*;
22 import io.swagger.annotations.Api; 22 import io.swagger.annotations.Api;
...@@ -49,6 +49,10 @@ public class PurchaseContractController { ...@@ -49,6 +49,10 @@ public class PurchaseContractController {
49 Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize); 49 Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize);
50 50
51 // 需要添加条件判断 51 // 需要添加条件判断
52 if(StringUtils.isEmpty(ERPPurchaseContract.getStatus())){
53 queryWrapper.lt("status" , "3");// >0
54 }
55 // 需要添加条件判断
52 IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper); 56 IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper);
53 result.setSuccess(true); 57 result.setSuccess(true);
54 result.setResult(pageList); 58 result.setResult(pageList);
...@@ -57,18 +61,19 @@ public class PurchaseContractController { ...@@ -57,18 +61,19 @@ public class PurchaseContractController {
57 @AutoLog(value = "erp采购合同-集团审核列表") 61 @AutoLog(value = "erp采购合同-集团审核列表")
58 @ApiOperation(value="erp采购合同-集团审核列表", notes="erp采购合同-集团审核列表") 62 @ApiOperation(value="erp采购合同-集团审核列表", notes="erp采购合同-集团审核列表")
59 @GetMapping(value = "/handleList") 63 @GetMapping(value = "/handleList")
60 public Result<IPage<ERPPurchaseContract>> handleList(ERPPurchaseContract ERPPurchaseContract, 64 public Result<IPage<ERPPurchaseContract>> handleList(ERPPurchaseContract purchaseContract,
61 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 65 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
62 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 66 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
63 HttpServletRequest req) { 67 HttpServletRequest req) {
64 Result<IPage<ERPPurchaseContract>> result = new Result<IPage<ERPPurchaseContract>>(); 68 Result<IPage<ERPPurchaseContract>> result = new Result<IPage<ERPPurchaseContract>>();
65 QueryWrapper<ERPPurchaseContract> queryWrapper = QueryGenerator.initQueryWrapper(ERPPurchaseContract, req.getParameterMap()); 69 QueryWrapper<ERPPurchaseContract> queryWrapper = QueryGenerator.initQueryWrapper(purchaseContract, req.getParameterMap());
66 Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize); 70 Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize);
67 71
68 // 需要添加条件判断 72 // 需要添加条件判断
69 queryWrapper.gt("status" , "0");// >0 73 if(StringUtils.isEmpty(purchaseContract.getStatus())){
70 queryWrapper.ne("status" , "2"); // 不等于2 74 queryWrapper.gt("status" , "0");// >0
71 75 queryWrapper.ne("status" , "2"); // 不等于2
76 }
72 IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper); 77 IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper);
73 result.setSuccess(true); 78 result.setSuccess(true);
74 result.setResult(pageList); 79 result.setResult(pageList);
...@@ -81,12 +86,18 @@ public class PurchaseContractController { ...@@ -81,12 +86,18 @@ public class PurchaseContractController {
81 public Result<List<ERPPurchaseContract>> purchaseContractList() { 86 public Result<List<ERPPurchaseContract>> purchaseContractList() {
82 Result<List<ERPPurchaseContract>> result = new Result<List<ERPPurchaseContract>>(); 87 Result<List<ERPPurchaseContract>> result = new Result<List<ERPPurchaseContract>>();
83 QueryWrapper<ERPPurchaseContract> queryWrapper = new QueryWrapper<ERPPurchaseContract> (); // QueryGenerator.initQueryWrapper(ERPPurchaseContract, req.getParameterMap()); 88 QueryWrapper<ERPPurchaseContract> queryWrapper = new QueryWrapper<ERPPurchaseContract> (); // QueryGenerator.initQueryWrapper(ERPPurchaseContract, req.getParameterMap());
84 queryWrapper.like("departs", BaseContextHandler.getRealDepartId()); 89 /* queryWrapper.like("departs", BaseContextHandler.getRealDepartId());*/
85 queryWrapper.orderByDesc("create_time"); 90 queryWrapper.orderByDesc("create_time");
86 // 需要添加条件判断 91 // 需要添加条件判断
87 List<ERPPurchaseContract> pageList = purchaseContractService.list( queryWrapper); 92 List<ERPPurchaseContract> purchaseContractList = purchaseContractService.list( queryWrapper);
88 result.setSuccess(true); 93
89 result.setResult(pageList); 94 /*Set<ERPPurchaseContract> dataList = new HashSet<>();
95 HashSet set = new HashSet(purchaseContractList);
96 purchaseContractList.clear();
97 purchaseContractList.addAll(set);*/
98
99 result.setSuccess(true);
100 result.setResult(purchaseContractList);
90 return result; 101 return result;
91 } 102 }
92 103
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchasePlanController.java
...@@ -75,7 +75,7 @@ public class PurchasePlanController { ...@@ -75,7 +75,7 @@ public class PurchasePlanController {
75 Result<IPage<PurchasePlan>> result = new Result<IPage<PurchasePlan>>(); 75 Result<IPage<PurchasePlan>> result = new Result<IPage<PurchasePlan>>();
76 QueryWrapper<PurchasePlan> queryWrapper = QueryGenerator.initQueryWrapper(purchasePlan, req.getParameterMap()); 76 QueryWrapper<PurchasePlan> queryWrapper = QueryGenerator.initQueryWrapper(purchasePlan, req.getParameterMap());
77 Page<PurchasePlan> page = new Page<PurchasePlan>(pageNo, pageSize); 77 Page<PurchasePlan> page = new Page<PurchasePlan>(pageNo, pageSize);
78 if(StringUtils.isNotEmpty( purchasePlan.getDepartId() ) ){ 78 /*if(StringUtils.isNotEmpty( purchasePlan.getDepartId() ) ){
79 queryWrapper.eq("depart_id", purchasePlan.getDepartId()); 79 queryWrapper.eq("depart_id", purchasePlan.getDepartId());
80 } 80 }
81 if(StringUtils.isNotEmpty( purchasePlan.getStatus() ) ){ 81 if(StringUtils.isNotEmpty( purchasePlan.getStatus() ) ){
...@@ -87,7 +87,7 @@ public class PurchasePlanController { ...@@ -87,7 +87,7 @@ public class PurchasePlanController {
87 87
88 if(StringUtils.isNotEmpty( purchasePlan.getApplyUser()) ){ 88 if(StringUtils.isNotEmpty( purchasePlan.getApplyUser()) ){
89 queryWrapper.like("apply_user", purchasePlan.getApplyUser()); 89 queryWrapper.like("apply_user", purchasePlan.getApplyUser());
90 } 90 }*/
91 queryWrapper.orderByDesc("create_time"); 91 queryWrapper.orderByDesc("create_time");
92 92
93 IPage<PurchasePlan> pageList = purchasePlanService.page(page, queryWrapper); 93 IPage<PurchasePlan> pageList = purchasePlanService.page(page, queryWrapper);
...@@ -109,7 +109,7 @@ public class PurchasePlanController { ...@@ -109,7 +109,7 @@ public class PurchasePlanController {
109 Page<PurchasePlan> page = new Page<PurchasePlan>(pageNo, pageSize); 109 Page<PurchasePlan> page = new Page<PurchasePlan>(pageNo, pageSize);
110 110
111 111
112 if(StringUtils.isNotEmpty( purchasePlan.getDepartId() ) ){ 112 /*if(StringUtils.isNotEmpty( purchasePlan.getDepartId() ) ){
113 queryWrapper.eq("depart_id", purchasePlan.getDepartId()); 113 queryWrapper.eq("depart_id", purchasePlan.getDepartId());
114 }else{ 114 }else{
115 //如果为管理员，则跳过权限 115 //如果为管理员，则跳过权限
...@@ -117,17 +117,18 @@ public class PurchasePlanController { ...@@ -117,17 +117,18 @@ public class PurchasePlanController {
117 queryWrapper.in("depart_id", BaseContextHandler.getDeparts().split(",")); 117 queryWrapper.in("depart_id", BaseContextHandler.getDeparts().split(","));
118 } 118 }
119 } 119 }
120 if(StringUtils.isNotEmpty( purchasePlan.getStatus() ) ){ 120
121 queryWrapper.eq("status", purchasePlan.getStatus());
122 }else{
123 queryWrapper.gt("status" , "0");// >0
124 queryWrapper.ne("status" , "2"); // 不等于2
125 }
126 if( StringUtils.isNotEmpty( purchasePlan.getApplyYear()) ){ 121 if( StringUtils.isNotEmpty( purchasePlan.getApplyYear()) ){
127 queryWrapper.eq("apply_year", purchasePlan.getApplyYear()); 122 queryWrapper.eq("apply_year", purchasePlan.getApplyYear());
128 } 123 }
129 if( StringUtils.isNotEmpty( purchasePlan.getApplyUser() ) ){ 124 if( StringUtils.isNotEmpty( purchasePlan.getApplyUser() ) ){
130 queryWrapper.like("apply_user", purchasePlan.getApplyUser()); 125 queryWrapper.like("apply_user", purchasePlan.getApplyUser());
126 }*/
127 if(StringUtils.isNotEmpty( purchasePlan.getStatus() ) ){
128 queryWrapper.eq("status", purchasePlan.getStatus());
129 }else{
130 queryWrapper.gt("status" , "0");// >0
131 queryWrapper.ne("status" , "2"); // 不等于2
131 } 132 }
132 queryWrapper.orderByDesc("create_time"); 133 queryWrapper.orderByDesc("create_time");
133 IPage<PurchasePlan> pageList = purchasePlanService.page(page, queryWrapper); 134 IPage<PurchasePlan> pageList = purchasePlanService.page(page, queryWrapper);
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/MaterialIN.java
...@@ -25,7 +25,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; ...@@ -25,7 +25,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
25 @Accessors(chain = true) 25 @Accessors(chain = true)
26 @ApiModel(value="erp_material_in对象", description="物料(药剂)入库") 26 @ApiModel(value="erp_material_in对象", description="物料(药剂)入库")
27 public class MaterialIN { 27 public class MaterialIN {
28 28
29 /**id*/ 29 /**id*/
30 @TableId(type = IdType.ID_WORKER_STR) 30 @TableId(type = IdType.ID_WORKER_STR)
31 @ApiModelProperty(value = "id") 31 @ApiModelProperty(value = "id")
...@@ -95,7 +95,7 @@ public class MaterialIN { ...@@ -95,7 +95,7 @@ public class MaterialIN {
95 /**供应商编号*/ 95 /**供应商编号*/
96 @Excel(name = "供应商编号", width = 15) 96 @Excel(name = "供应商编号", width = 15)
97 @ApiModelProperty(value = "供应商编号") 97 @ApiModelProperty(value = "供应商编号")
98 @Dict(dictTable = "equipment_sparepart_supplies", dicCode="id", dicText = "sparepart_name") 98 @Dict(dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
99 private String supplierId; 99 private String supplierId;
100 /**货号*/ 100 /**货号*/
101 @Excel(name = "货号", width = 15) 101 @Excel(name = "货号", width = 15)
...@@ -193,4 +193,9 @@ public class MaterialIN { ...@@ -193,4 +193,9 @@ public class MaterialIN {
193 @TableField(exist = false) 193 @TableField(exist = false)
194 @ApiModelProperty(value = "开始时间") 194 @ApiModelProperty(value = "开始时间")
195 private String startTime; 195 private String startTime;
196
197 @TableField(exist = false)
198 @ApiModelProperty(value = "物料类别")
199 private String sparepartTypeName;
200
196 } 201 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 and mi.supplier_id = #{supplierId} 31 and mi.supplier_id = #{supplierId}
32 </if> 32 </if>
33 </where> 33 </where>
34 34 order by arrive_time desc
35 </select> 35 </select>
36 36
37 <!--获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索 --> 37 <!--获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索 -->
...@@ -64,4 +64,4 @@ ...@@ -64,4 +64,4 @@
64 64
65 65
66 66
67 </mapper>
...\ No newline at end of file ...\ No newline at end of file
67 </mapper>
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/app/APPDangerInspectionRecordController.java
...@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 import com.skua.core.api.vo.Result; 7 import com.skua.core.api.vo.Result;
8 import com.skua.core.aspect.annotation.AutoLog; 8 import com.skua.core.aspect.annotation.AutoLog;
9 import com.skua.core.query.QueryGenerator;
10 import com.skua.modules.safe.entity.DangerInspectionRecord; 9 import com.skua.modules.safe.entity.DangerInspectionRecord;
11 import com.skua.modules.safe.entity.DangerLevelManage;
12 import com.skua.modules.safe.service.IDangerInspectionItemService;
13 import com.skua.modules.safe.service.IDangerInspectionRecordService; 10 import com.skua.modules.safe.service.IDangerInspectionRecordService;
14 import com.skua.modules.safe.vo.DangerInspectionRecordVO; 11 import com.skua.modules.safe.vo.DangerInspectionRecordVO;
15 import com.skua.modules.safe.vo.DangerLevelManageVO; 12 import com.skua.modules.safe.vo.DangerLevelManageVO;
...@@ -18,7 +15,6 @@ import io.swagger.annotations.Api; ...@@ -18,7 +15,6 @@ import io.swagger.annotations.Api;
18 import io.swagger.annotations.ApiOperation; 15 import io.swagger.annotations.ApiOperation;
19 import lombok.extern.slf4j.Slf4j; 16 import lombok.extern.slf4j.Slf4j;
20 import org.apache.commons.lang3.StringUtils; 17 import org.apache.commons.lang3.StringUtils;
21 import org.apache.ibatis.annotations.Param;
22 import org.springframework.beans.factory.annotation.Autowired; 18 import org.springframework.beans.factory.annotation.Autowired;
23 import org.springframework.web.bind.annotation.GetMapping; 19 import org.springframework.web.bind.annotation.GetMapping;
24 import org.springframework.web.bind.annotation.RequestMapping; 20 import org.springframework.web.bind.annotation.RequestMapping;
...@@ -60,10 +56,6 @@ public class APPDangerInspectionRecordController { ...@@ -60,10 +56,6 @@ public class APPDangerInspectionRecordController {
60 QueryWrapper<DangerInspectionRecord> queryWrapper = new QueryWrapper<DangerInspectionRecord>();// QueryGenerator.initQueryWrapper(dangerInspectionRecord, req.getParameterMap()); 56 QueryWrapper<DangerInspectionRecord> queryWrapper = new QueryWrapper<DangerInspectionRecord>();// QueryGenerator.initQueryWrapper(dangerInspectionRecord, req.getParameterMap());
61 Page<DangerInspectionRecord> page = new Page<DangerInspectionRecord>(pageNo, pageSize); 57 Page<DangerInspectionRecord> page = new Page<DangerInspectionRecord>(pageNo, pageSize);
62 58
63 if(dangerInspectionRecord.getDepartId() != null && dangerInspectionRecord.getDepartId().length() > 0 ){
64 queryWrapper.eq("depart_id", dangerInspectionRecord.getDepartId());
65 }
66
67 if(dangerInspectionRecord.getEquipInfoId() != null && dangerInspectionRecord.getEquipInfoId().length() > 0 ){ 59 if(dangerInspectionRecord.getEquipInfoId() != null && dangerInspectionRecord.getEquipInfoId().length() > 0 ){
68 queryWrapper.eq("equip_info_id", dangerInspectionRecord.getEquipInfoId()); 60 queryWrapper.eq("equip_info_id", dangerInspectionRecord.getEquipInfoId());
69 } 61 }
...@@ -83,6 +75,7 @@ public class APPDangerInspectionRecordController { ...@@ -83,6 +75,7 @@ public class APPDangerInspectionRecordController {
83 queryWrapper.eq("status", dangerInspectionRecord.getStatus() ) ; 75 queryWrapper.eq("status", dangerInspectionRecord.getStatus() ) ;
84 } 76 }
85 77
78 queryWrapper.orderByDesc("report_date");
86 // queryWrapper.eq("report_user", BaseContextHandler.getUserId()); 79 // queryWrapper.eq("report_user", BaseContextHandler.getUserId());
87 IPage<DangerInspectionRecord> pageList = dangerInspectionRecordService.page(page, queryWrapper); 80 IPage<DangerInspectionRecord> pageList = dangerInspectionRecordService.page(page, queryWrapper);
88 result.setSuccess(true); 81 result.setSuccess(true);
...@@ -116,8 +109,6 @@ public class APPDangerInspectionRecordController { ...@@ -116,8 +109,6 @@ public class APPDangerInspectionRecordController {
116 } 109 }
117 //Statistics 110 //Statistics
118 111
119
120
121 @AutoLog(value = "隐患排查记录：根据风险点统计记录") 112 @AutoLog(value = "隐患排查记录：根据风险点统计记录")
122 @ApiOperation(value="隐患排查记录：根据风险点统计记录", notes="隐患排查记录：根据风险点统计记录") 113 @ApiOperation(value="隐患排查记录：根据风险点统计记录", notes="隐患排查记录：根据风险点统计记录")
123 @GetMapping(value = "/statistics") 114 @GetMapping(value = "/statistics")
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!