From 2cef955017c735c2828e69f878d3d6b44200074f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 22 八月 2023 16:54:57 +0800
Subject: [PATCH] 111
---
/dev/null | 71 --------------
server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java | 44 ++++++--
server/src/main/java/doumeemes/api/ext/StatisticsController.java | 1
server/src/main/java/doumeemes/dao/ext/join/UnQualifiedRecordJoinMapper.java | 14 ++
server/src/main/java/doumeemes/dao/ext/dto/QueryUnQualifiedRecordDTO.java | 24 ++++
server/src/main/resources/mappers/WorkorderExtMapper.xml | 4
server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java | 2
server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java | 61 ++++++++++++
server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java | 53 ++++++++++
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java | 8 -
server/src/main/java/doumeemes/service/business/UnqualifiedRecordService.java | 5 +
11 files changed, 193 insertions(+), 94 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/business/UnqualifiedRecordController.java b/server/src/main/java/doumeemes/api/business/UnqualifiedRecordController.java
deleted file mode 100644
index 5fd198e..0000000
--- a/server/src/main/java/doumeemes/api/business/UnqualifiedRecordController.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package doumeemes.api.business;
-
-import doumeemes.api.BaseController;
-import doumeemes.core.annotation.excel.ExcelExporter;
-import doumeemes.core.annotation.pr.PreventRepeat;
-import doumeemes.core.model.ApiResponse;
-import doumeemes.core.model.PageWrap;
-import doumeemes.core.model.PageData;
-import doumeemes.dao.business.model.UnqualifiedRecord;
-import doumeemes.service.business.UnqualifiedRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @since 2023/08/16 14:15
- */
-@Api(tags = "宸ュ崟绫�-鎶ュ伐涓嶈壇璁板綍绫诲瀷琛�")
-@RestController
-@RequestMapping("/business/unqualifiedRecord")
-public class UnqualifiedRecordController extends BaseController {
-
- @Autowired
- private UnqualifiedRecordService unqualifiedRecordService;
-
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:unqualifiedrecord:create")
- public ApiResponse create(@RequestBody UnqualifiedRecord unqualifiedRecord) {
- return ApiResponse.success(unqualifiedRecordService.create(unqualifiedRecord));
- }
-
- @ApiOperation("鏍规嵁ID鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("business:unqualifiedrecord:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- unqualifiedRecordService.deleteById(id);
- return ApiResponse.success(null);
- }
-
-
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:unqualifiedrecord:update")
- public ApiResponse updateById(@RequestBody UnqualifiedRecord unqualifiedRecord) {
- unqualifiedRecordService.updateById(unqualifiedRecord);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("business:unqualifiedrecord:query")
- public ApiResponse<PageData<UnqualifiedRecord>> findPage (@RequestBody PageWrap<UnqualifiedRecord> pageWrap) {
- return ApiResponse.success(unqualifiedRecordService.findPage(pageWrap));
- }
-
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:unqualifiedrecord:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(unqualifiedRecordService.findById(id));
- }
-}
diff --git a/server/src/main/java/doumeemes/api/ext/StatisticsController.java b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
index 5ca5d15..078144f 100644
--- a/server/src/main/java/doumeemes/api/ext/StatisticsController.java
+++ b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
@@ -38,6 +38,7 @@
public ApiResponse<StatisticsPlanDataModel> getPlansData(@PathVariable Integer companyId, @PathVariable Integer departId) {
return ApiResponse.success(statisticsService.getPlansData(companyId,departId));
}
+
@ApiOperation("鏁版嵁缁熻-宸ュ簭璁″垝锛屾墽琛屼腑銆佸欢鏈熻鍒掓暟銆佷粖鏃ョ敓浜т汉鏁般�佷粖鏃ョ敓浜ц澶囨暟銆佷粖鏃ヤ笉鑹搧")
@GetMapping("/getProcedurePlanData/{companyId}/{departId}")
public ApiResponse<StatisticsPlanDataModel> getProcedurePlanData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam(required = false) Integer procedureId) {
diff --git a/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
new file mode 100644
index 0000000..6d573c2
--- /dev/null
+++ b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
@@ -0,0 +1,53 @@
+package doumeemes.api.ext;
+
+import doumeemes.api.BaseController;
+import doumeemes.core.annotation.excel.ExcelExporter;
+import doumeemes.core.model.ApiResponse;
+import doumeemes.core.model.PageData;
+import doumeemes.core.model.PageWrap;
+import doumeemes.core.utils.DateUtil;
+import doumeemes.dao.business.model.UnqualifiedRecord;
+import doumeemes.dao.business.vo.WorkPlansVO;
+import doumeemes.dao.ext.dto.QueryUnQualifiedRecordDTO;
+import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
+import doumeemes.service.business.UnqualifiedRecordService;
+import doumeemes.service.business.UserDeviceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/8/22 13:56
+ */
+
+@RestController
+@RequestMapping("/ext/unqualifiedRecord")
+@Api(tags = "宸ュ崟绫�-鎶ュ伐涓嶈壇璁板綍绫诲瀷琛�")
+public class UnqualifiedRecordExtController extends BaseController {
+
+ @Autowired
+ private UnqualifiedRecordService unqualifiedRecordService;
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ public ApiResponse<PageData<UnqualifiedRecord>> findJoinPage (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap) {
+ return ApiResponse.success(unqualifiedRecordService.findJoinPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ public void exportExcel (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap, HttpServletResponse response) throws Exception{
+ ExcelExporter.build(UnqualifiedRecord.class).export(unqualifiedRecordService.findJoinPage(pageWrap).getRecords(), "涓嶈壇浜у嚭鏄庣粏璁板綍"+ DateUtil.getNowLongTime(), response);
+ }
+
+}
diff --git a/server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java b/server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java
index 485712f..32b16ab 100644
--- a/server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java
+++ b/server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java
@@ -1,5 +1,6 @@
package doumeemes.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,28 +24,23 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 7,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@@ -53,27 +49,51 @@
private String remark;
@ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�", example = "1")
- @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
private Integer rootDepartId;
@ApiModelProperty(value = "鍏徃绾х粍缁囩紪鐮侊紙鍏宠仈department琛級", example = "1")
- @ExcelColumn(name="鍏徃绾х粍缁囩紪鐮侊紙鍏宠仈department琛級")
private Integer departId;
@ApiModelProperty(value = "宸ュ崟涓婚敭", example = "1")
- @ExcelColumn(name="宸ュ崟涓婚敭")
private Integer workorderId;
@ApiModelProperty(value = "浜у嚭璁板綍涓婚敭", example = "1")
- @ExcelColumn(name="浜у嚭璁板綍涓婚敭")
private Integer recordId;
@ApiModelProperty(value = "绫诲埆涓婚敭", example = "1")
- @ExcelColumn(name="绫诲埆涓婚敭")
private Integer categoryId;
@ApiModelProperty(value = "妫�楠屼笉鍚堟牸鏁伴噺", example = "1")
- @ExcelColumn(name="妫�楠屼笉鍚堟牸鏁伴噺")
+ @ExcelColumn(name="鏁伴噺",index = 6,width =15)
private BigDecimal unqualifiedNum;
+ @ApiModelProperty(value = "宸ュ崟缂栫爜", example = "1")
+ @ExcelColumn(name="宸ュ崟缂栫爜",index = 1,width =15)
+ @TableField(exist = false)
+ private String workOrderCode;
+
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "1")
+ @ExcelColumn(name="鐗╂枡鍚嶇О",index = 2,width =15)
+ @TableField(exist = false)
+ private String materialName;
+
+ @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "1")
+ @ExcelColumn(name="鐗╂枡缂栫爜",index = 3,width =15)
+ @TableField(exist = false)
+ private String materialCode;
+
+ @ApiModelProperty(value = "宸ュ簭", example = "1")
+ @ExcelColumn(name="宸ュ簭",index = 4,width =15)
+ @TableField(exist = false)
+ private String proceduresName;
+
+ @ApiModelProperty(value = "涓嶈壇椤�", example = "1")
+ @ExcelColumn(name="涓嶈壇椤�",index = 5,width =15)
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "鍒涘缓浜�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜�",index = 8,width =15)
+ @TableField(exist = false)
+ private String createUserName;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryUnQualifiedRecordDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryUnQualifiedRecordDTO.java
new file mode 100644
index 0000000..5987f60
--- /dev/null
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryUnQualifiedRecordDTO.java
@@ -0,0 +1,24 @@
+package doumeemes.dao.ext.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/8/22 14:02
+ */
+@Data
+public class QueryUnQualifiedRecordDTO {
+
+ @ApiModelProperty("宸ュ崟缂栫爜")
+ private String code;
+
+ @ApiModelProperty("涓嶈壇椤逛富閿�")
+ private Integer categoryId;
+
+
+}
diff --git a/server/src/main/java/doumeemes/dao/ext/join/UnQualifiedRecordJoinMapper.java b/server/src/main/java/doumeemes/dao/ext/join/UnQualifiedRecordJoinMapper.java
new file mode 100644
index 0000000..1175fab
--- /dev/null
+++ b/server/src/main/java/doumeemes/dao/ext/join/UnQualifiedRecordJoinMapper.java
@@ -0,0 +1,14 @@
+package doumeemes.dao.ext.join;
+
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import doumeemes.dao.business.model.UnqualifiedRecord;
+import doumeemes.dao.system.model.SystemLoginLog;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/8/22 13:55
+ */
+public interface UnQualifiedRecordJoinMapper extends MPJJoinMapper<UnqualifiedRecord> {
+}
diff --git a/server/src/main/java/doumeemes/service/business/UnqualifiedRecordService.java b/server/src/main/java/doumeemes/service/business/UnqualifiedRecordService.java
index 0024bb7..70a959e 100644
--- a/server/src/main/java/doumeemes/service/business/UnqualifiedRecordService.java
+++ b/server/src/main/java/doumeemes/service/business/UnqualifiedRecordService.java
@@ -3,6 +3,8 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.model.UnqualifiedRecord;
+import doumeemes.dao.ext.dto.QueryUnQualifiedRecordDTO;
+
import java.util.List;
/**
@@ -94,4 +96,7 @@
* @return long
*/
long count(UnqualifiedRecord unqualifiedRecord);
+
+
+ PageData<UnqualifiedRecord> findJoinPage(PageWrap<QueryUnQualifiedRecordDTO> pageWrap);
}
diff --git a/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
index d0fa52f..59a226b 100644
--- a/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
@@ -1,20 +1,33 @@
package doumeemes.service.business.impl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import doumeemes.core.constants.ResponseStatus;
+import doumeemes.core.exception.BusinessException;
+import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
+import doumeemes.core.utils.Constants;
import doumeemes.core.utils.Utils;
import doumeemes.dao.business.UnqualifiedRecordMapper;
-import doumeemes.dao.business.model.UnqualifiedRecord;
+import doumeemes.dao.business.model.*;
+import doumeemes.dao.ext.dto.QueryUnQualifiedRecordDTO;
+import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
+import doumeemes.dao.ext.join.UnQualifiedRecordJoinMapper;
+import doumeemes.dao.system.model.SystemLoginLog;
+import doumeemes.dao.system.model.SystemUser;
import doumeemes.service.business.UnqualifiedRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 宸ュ崟绫�-鎶ュ伐涓嶈壇璁板綍绫诲瀷琛⊿ervice瀹炵幇
@@ -26,6 +39,10 @@
@Autowired
private UnqualifiedRecordMapper unqualifiedRecordMapper;
+
+ @Autowired
+ private UnQualifiedRecordJoinMapper unQualifiedRecordJoinMapper;
+
@Override
public Integer create(UnqualifiedRecord unqualifiedRecord) {
@@ -121,4 +138,46 @@
QueryWrapper<UnqualifiedRecord> wrapper = new QueryWrapper<>(unqualifiedRecord);
return unqualifiedRecordMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public PageData<UnqualifiedRecord> findJoinPage(PageWrap<QueryUnQualifiedRecordDTO> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎮ㄦ棤鏉冮檺杩涜璇ユ搷浣滐紒");
+ }
+
+ IPage<UnqualifiedRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<UnqualifiedRecord> mpjLambdaWrapper = new MPJLambdaWrapper<>();
+ mpjLambdaWrapper.selectAll(UnqualifiedRecord.class);
+ mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getWorkOrderCode);
+ mpjLambdaWrapper.selectAs(Material::getCode, UnqualifiedRecord::getMaterialName);
+ mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getMaterialCode);
+ mpjLambdaWrapper.selectAs(Procedures::getName, UnqualifiedRecord::getProceduresName);
+ mpjLambdaWrapper.selectAs(Category::getName, UnqualifiedRecord::getCategoryName);
+ mpjLambdaWrapper.selectAs(SystemUser::getRealname, UnqualifiedRecord::getCreateUserName);
+
+ mpjLambdaWrapper.leftJoin(Workorder.class,Workorder::getId,UnqualifiedRecord::getWorkorderId);
+ mpjLambdaWrapper.leftJoin(MaterialDistribute.class,MaterialDistribute::getId,Workorder::getMaterialId);
+ mpjLambdaWrapper.leftJoin(Material.class,Material::getId,MaterialDistribute::getMaterialId);
+ mpjLambdaWrapper.leftJoin(Procedures.class,Procedures::getId,Workorder::getProcedureId);
+ mpjLambdaWrapper.leftJoin(Category.class,Category::getId,UnqualifiedRecord::getCategoryId);
+ mpjLambdaWrapper.leftJoin(SystemUser.class,SystemUser::getId,UnqualifiedRecord::getCreateUser);
+ //鍙兘鏌ョ湅褰撳墠鏍圭粍缁囩殑鏁版嵁
+ mpjLambdaWrapper.eq(Workorder::getRootDepartId,user.getRootDepartment().getId());
+ //濡傛灉褰撳墠閫夋嫨鐨勫叕鍙哥骇缁勭粐闈炴牴缁勭粐淇℃伅锛屽彧鑳芥煡鐪嬪綋鍓嶉�夋嫨鍏徃绾х粍缁囨暟鎹�
+ mpjLambdaWrapper.eq(Workorder::getDepartId,user.getCurComDepartment().getId());
+ mpjLambdaWrapper.eq(UnqualifiedRecord::getDeleted,Constants.ZERO);
+ // 涓嶈壇鍒嗙被鍒嗙被
+ if ( pageWrap.getModel().getCategoryId() !=null) {
+ mpjLambdaWrapper.eq(UnqualifiedRecord::getCategoryId, pageWrap.getModel().getCategoryId());
+ }
+ // 宸ュ崟缂栫爜
+ if (StringUtils.isNotBlank(pageWrap.getModel().getCode())) {
+ mpjLambdaWrapper.like(Workorder::getCode, pageWrap.getModel().getCode());
+ }
+ return PageData.from(unQualifiedRecordJoinMapper.selectJoinPage(page, UnqualifiedRecord.class,mpjLambdaWrapper));
+ }
+
+
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
index 961192c..c3ecd72 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -127,7 +127,7 @@
if(user.getProcedureIds()!=null){
pageWrap.setProcedureIds(user.getProcedureIds());
}else{
- pageWrap.setUserId(user.getId());
+ pageWrap.setCreateUser(user.getId());
}
List<PlansExtListVO> result = plansExtMapper.selectList(pageWrap);
if(result==null||result.size()==0){
@@ -190,12 +190,6 @@
pageWrap.getModel().setCreateUser(user.getId());
//鍚﹀垯璧版暟鎹潈闄�
pageWrap.getModel().setDepartIds(dataPermission);
- /* if(dataPermission.size() == 0){
- //鍙兘鐪嬭嚜宸辩殑
- pageWrap.getModel().setCreateUser(user.getId());
- }else{
-
- }*/
}
if(user.getProcedureIds()!=null){
pageWrap.getModel().setProcedureIds(user.getProcedureIds());
diff --git a/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
index 4f441f8..2688935 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
@@ -230,7 +230,7 @@
return new ArrayList<>();
}
Bom bom = bomList.get(Constants.ZERO);
- List<Procedures> proceduresList = proceduresMapper.selectList(
+ List<Procedures> proceduresList = proceduresMapper.selectList(
new QueryWrapper<Procedures>().apply(" id in ( select r.PROCEDURE_ID from route_procedure r where r.ROUTE_ID = '"+bom.getRouteId()+"' ) ")
.orderByAsc( " SORTNUM ")
);
diff --git a/server/src/main/resources/mappers/WorkorderExtMapper.xml b/server/src/main/resources/mappers/WorkorderExtMapper.xml
index 8ddc14a..a2cc437 100644
--- a/server/src/main/resources/mappers/WorkorderExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderExtMapper.xml
@@ -944,8 +944,8 @@
<choose>
<when test="departIds != null and departIds.size()>0">
AND ( `a`.`CREATE_USER` = #{createUser} or
- exists (select d.id from workorder_user d where d.WORKORDER_ID=a.id and d.DELETED=0 and d.PRO_USER_ID=#{createUser} )
- or exists (select d.id from company_user d where d.user_id= a.CREATE_USER and d.department_id
+ exists ( select d.id from workorder_user d where d.WORKORDER_ID=a.id and d.DELETED=0 and d.PRO_USER_ID=#{createUser} )
+ or exists ( select d.id from company_user d where d.user_id= a.CREATE_USER and d.department_id
in <foreach collection="departIds" item="item" separator="," open="(" close=")">#{item}</foreach>)
or exists (select d.id from workorder_user wu left join company_user d on wu.PRO_USER_ID=d.USER_ID and d.DELETED=0 where wu.WORKORDER_ID= a.id and d.department_id
in <foreach collection="departIds" item="item" separator="," open="(" close=")">#{item}</foreach>)
--
Gitblit v1.9.3