嘉禾二期

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/Excel/InstrumentExcel.java

@@ -52,8 +52,8 @@ public class InstrumentExcel implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date purchaseTime;
 
-    @ExcelProperty("是否需要检定（是、否）")
+    /*@ExcelProperty("是否需要检定（是、否）")
-    private String isVerification;
+    private String isVerification;*/
 
     @ExcelProperty("报废年限")
     private Integer scrapYears;

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java

@@ -67,7 +67,7 @@ public class ApplyController extends BladeController {
         LambdaQueryWrapper<Apply> wrapper = new LambdaQueryWrapper<>(apply);
         if ("1".equals(apply.getIsGetAll())) {
             if (apply.getStatus() == null) {
-                wrapper.in(Apply::getStatus, 1, 2, 3, 4);
+                wrapper.in(Apply::getStatus, 0,1, 2, 3, 4);
             }
         }
 
@@ -211,7 +211,7 @@ public class ApplyController extends BladeController {
                     goodsService.updateById(goods);
                 }
                 // 扣批次数量
-                /*String batchNum = applyDetail.getBatchNum();
+                String batchNum = applyDetail.getBatchNum();
                 if (batchNum != null && !"".equals(batchNum)) {
                     String[] split = batchNum.split(",");
                     for (String s : split) {
@@ -224,7 +224,7 @@ public class ApplyController extends BladeController {
                         productStoreDetial.setNum(i);
                         productStoreDetialService.updateById(productStoreDetial);
                     }
-                }*/
+                }
             }
             applyDetailService.saveBatch(detailList);
         }

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java

@@ -1,31 +1,28 @@
 
 package org.springblade.lims.goods.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.lims.capital.excel.ApplyDetailExcel;
-import org.springblade.lims.goods.entity.Apply;
 import org.springblade.lims.goods.entity.ApplyDetail;
 import org.springblade.lims.goods.entity.Goods;
 import org.springblade.lims.goods.service.IApplyDetailService;
-import org.springblade.lims.goods.service.IApplyService;
 import org.springblade.lims.goods.service.IGoodsService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -46,6 +43,10 @@ public class ApplyDetailController extends BladeController {
      */
     @GetMapping("/list")
     public R list(ApplyDetail apply, Query query) {
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            apply.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+        }
         IPage<ApplyDetail> page = applyDetailService.tjlist(apply, Condition.getPage(query));
         List<ApplyDetail> details = page.getRecords();
         if (CollectionUtils.isNotEmpty(details)) {

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java

@@ -18,6 +18,7 @@ import org.apache.commons.lang.math.RandomUtils;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -95,6 +96,10 @@ public class GoodsController extends BladeController {
     @GetMapping("/list")
     public IPage<Goods> list(Goods goods, Query query) {
         LambdaQueryWrapper<Goods> queryWrapper = new LambdaQueryWrapper<>();
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            queryWrapper.eq(BaseEntity::getCreateDept,AuthUtil.getDeptId());
+        }
         // 添加物品查询模糊查询
         if (StringUtil.isNoneBlank(goods.getName())) {
             queryWrapper.and(eq -> eq
@@ -162,14 +167,15 @@ public class GoodsController extends BladeController {
         goods.setNum(0);
         // 创建时间
         goods.setCreateTime(new Date());
+        goods.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
         // 消息通知
-        List<User> userList = userClient.listRolebyId("实验室组长").getData();
+        /*List<User> userList = userClient.listRolebyId("实验室组长").getData();
         if (userList != null) {
             for (User user : userList) {
                 messageClient.event(SysTypeEnum.INFORM.getValue(), "质检入库",
                         "你有新的物品待质检,请及时处理", 1, 5, user.getId().toString(), "/capital/productstoreList");
             }
-        }
+        }*/
         return goodsService.save(goods);
     }
 
@@ -668,6 +674,10 @@ public class GoodsController extends BladeController {
     @GetMapping("/census")
     public R census(Goods goods, Query query) {
         LambdaQueryWrapper<Goods> wrapper = new LambdaQueryWrapper<>();
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            wrapper.eq(BaseEntity::getCreateDept,AuthUtil.getDeptId());
+        }
         if (StringUtils.isNotBlank(goods.getName())) {
             wrapper.and(wq -> wq
                     .like(Goods::getName, goods.getName()).or()

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ReportController.java

@@ -7,12 +7,12 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.lims.capital.entity.ApplyOrderDetail;
-import org.springblade.lims.capital.vo.ApplyOrderDetailVO;
 import org.springblade.lims.goods.entity.Report;
 import org.springblade.lims.goods.service.IReportService;
 import org.springblade.lims.goods.vo.ReportVO;
@@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 物品报损表 控制器
  */
@@ -38,6 +41,10 @@ public class ReportController extends BladeController {
         if (StringUtil.isNoneBlank(report.getReportGoodsName())) {
             wrapper.like(Report::getReportGoodsName, report.getReportGoodsName());
         }
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            wrapper.eq(BaseEntity::getCreateDept,AuthUtil.getDeptId());
+        }
         wrapper.orderByDesc(Report::getCreateTime);
         return R.data(reportService.page(Condition.getPage(query), wrapper));
     }

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml

@@ -27,6 +27,10 @@
             <if test="apply.startTime != null and apply.endTime != null">
                 and b.create_time &gt;= #{apply.startTime} and b.create_time &lt;= #{apply.endTime}
             </if>
+            <if test="apply.createDept != null">
+                and a.create_dept = #{apply.createDept}
+            </if>
+
             and b.is_deleted = 0
             order by b.create_time desc
         </where>

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InstrumentController.java

@@ -75,6 +75,9 @@ public class InstrumentController extends BladeController {
         if (entry.getStatus() != null) {
             wrapper.eq(Instrument::getStatus, entry.getStatus());
         }
+        if (entry.getRunStatus() != null) {
+            wrapper.eq(Instrument::getRunStatus, entry.getRunStatus());
+        }
         // 根据是否需要检定筛选
         if (StringUtils.isNotBlank(entry.getIsVerification())) {
             wrapper.eq(Instrument::getIsVerification, entry.getIsVerification());
@@ -255,7 +258,7 @@ public class InstrumentController extends BladeController {
         list.forEach(item -> {
             item.setType(DictBizCache.getValue(DictBizEnum.INSTRUMENT.getName(), item.getType()));
             item.setInstrumentStatus(DictBizCache.getValue(DictBizEnum.EQUIP_STATUS.getName(), item.getInstrumentStatus()));
-            item.setIsVerification(DictCache.getValue(DictEnum.YES_NO.getName(), item.getIsVerification()));
+            //item.setIsVerification(DictCache.getValue(DictEnum.YES_NO.getName(), item.getIsVerification()));
         });
         ExcelUtil.export(response, "仪器设备管理数据", "仪器设备管理", list, InstrumentExcel.class);
     }
@@ -288,9 +291,9 @@ public class InstrumentController extends BladeController {
                 builder.append("第").append(i+2).append("行保管人不能为空;");
                 continue;
             }
-            if(StringUtils.isEmpty(excel.getIsVerification())){
+            /*if(StringUtils.isEmpty(excel.getIsVerification())){
                 builder.append("第").append(i+2).append("行是否需要鉴定不能为空;");
-            }
+            }*/
         }
         return builder;
     }

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/PurchaseApplyController.java

@@ -7,12 +7,16 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.lims.entry.PurchaseApply;
 import org.springblade.lims.service.IPurchaseApplyService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.List;
+
 
 /**
  * @author sjx
@@ -28,6 +32,10 @@ public class PurchaseApplyController extends BladeController {
 
     @GetMapping("/page")
     public R<Object> page(PurchaseApply entry, Query query) {
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+        }
         return R.data(service.findPage(entry, query));
     }
 

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/PurchaseCheckController.java

@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Charsets;
 import org.springblade.core.tool.utils.Func;
@@ -24,6 +25,8 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.io.InputStream;
 import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 
@@ -42,6 +45,10 @@ public class PurchaseCheckController extends BladeController {
 
     @GetMapping("/page")
     public R<Object> page(PurchaseCheck entry, Query query) {
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+        }
         return R.data(service.findPage(entry, query));
     }
 

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -22,6 +23,7 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -51,6 +53,15 @@ public class RepairApplicationController extends BladeController {
     @GetMapping("/list")
     public R<IPage> list(RepairApplication repairApplication, Query query) {
         LambdaQueryWrapper<RepairApplication> wrapper = new LambdaQueryWrapper<>();
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            if(roles.contains("设备维修审批") || roles.contains("仓库管理")){
+                wrapper.eq(BaseEntity::getCreateDept,AuthUtil.getDeptId());
+            }
+            if(roles.contains("维修")){
+                wrapper.eq(RepairApplication::getRepairTeam,AuthUtil.getDeptId());
+            }
+        }
         if (repairApplication.getStatus() != null) {
             wrapper.eq(RepairApplication::getStatus, repairApplication.getStatus());
         }

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ScrapApplicationController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -18,7 +19,9 @@ import org.springblade.resource.feign.IMessageClient;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author swj
@@ -43,6 +46,10 @@ public class ScrapApplicationController extends BladeController {
     @GetMapping("/list")
     public R<IPage> list(ScrapApplication scrapApplication, Query query) {
         LambdaQueryWrapper<ScrapApplication> wrapper = new LambdaQueryWrapper<>();
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            wrapper.eq(BaseEntity::getCreateDept,AuthUtil.getDeptId());
+        }
         if (scrapApplication.getStatus() != null) {
             wrapper.eq(ScrapApplication::getStatus, scrapApplication.getStatus());
         }

lab-service/lab-lims/src/main/java/org/springblade/lims/mqtt/callback/MyMQTTCallback.java

@@ -212,7 +212,7 @@ public class MyMQTTCallback implements MqttCallbackExtended {
             if("online".equals(map.get("status").toString())){
                 instrument.setRunStatus(1);
             }else{
-                instrument.setRunStatus(4);
+                instrument.setRunStatus(2);
             }
             instrumentService.update(instrument,wrapper);
         }

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainProjectServiceImpl.java

@@ -55,7 +55,7 @@ public class MaintainProjectServiceImpl extends BaseServiceImpl<MaintainProjectM
         }
 
         if(StringUtils.isNotBlank(entry.getCode())){
-            wrapper.eq(MaintainProject::getCode,entry.getCode());
+            wrapper.like(MaintainProject::getCode,entry.getCode());
         }
         if(StringUtils.isNotBlank(entry.getName())){
             wrapper.eq(MaintainProject::getName,entry.getName());

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/PurchaseApplyServiceImpl.java

@@ -48,10 +48,10 @@ public class PurchaseApplyServiceImpl extends BaseServiceImpl<PurchaseApplyMappe
             wrapper.eq(PurchaseApply::getSupplierId,entry.getSupplierId());
         }
         if(StringUtils.isNotBlank(entry.getBusinessCode())){
-            wrapper.eq(PurchaseApply::getBusinessCode,entry.getBusinessCode());
+            wrapper.like(PurchaseApply::getBusinessCode,entry.getBusinessCode());
         }
         if(StringUtils.isNotBlank(entry.getName())){
-            wrapper.eq(PurchaseApply::getName,entry.getName());
+            wrapper.like(PurchaseApply::getName,entry.getName());
         }
         if(StringUtils.isNotBlank(entry.getAssetCheck())){
             wrapper.eq(PurchaseApply::getAssetCheck,entry.getAssetCheck());
@@ -62,6 +62,9 @@ public class PurchaseApplyServiceImpl extends BaseServiceImpl<PurchaseApplyMappe
         if(StringUtils.isNotBlank(entry.getApplyDateEnd())){
             wrapper.le(PurchaseApply::getApplyDate,entry.getApplyDateEnd());
         }
+        if(entry.getCreateDept() != null){
+            wrapper.eq(PurchaseApply::getCreateDept,entry.getCreateDept());
+        }
         wrapper.eq(BaseEntity::getIsDeleted,0);
         wrapper.orderByDesc(PurchaseApply::getCreateTime);
         IPage<PurchaseApply> page = this.page(Condition.getPage(query), wrapper);
@@ -75,6 +78,7 @@ public class PurchaseApplyServiceImpl extends BaseServiceImpl<PurchaseApplyMappe
         if(entry.getId() == null){
             entry.setCreateUser(AuthUtil.getUserId());
             entry.setCreateTime(date);
+            entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
             entry.setBusinessCode("CGSQ"+ DateFormatUtils.format(date,"yyyyMMddhhmmss")+ StringUtil.randomUUID().substring(0,5));
             entry.setOriginatorId(AuthUtil.getUserId().toString());
             entry.setAssetCheck("0");

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/PurchaseCheckServiceImpl.java

@@ -53,7 +53,7 @@ public class PurchaseCheckServiceImpl extends BaseServiceImpl<PurchaseCheckMappe
         LambdaQueryWrapper<PurchaseCheck> wrapper = new LambdaQueryWrapper<>();
 
         if(StringUtils.isNotBlank(entry.getBusinessCode())){
-            wrapper.eq(PurchaseCheck::getBusinessCode,entry.getBusinessCode());
+            wrapper.like(PurchaseCheck::getBusinessCode,entry.getBusinessCode());
         }
 
         if(StringUtils.isNotBlank(entry.getName())){
@@ -61,7 +61,7 @@ public class PurchaseCheckServiceImpl extends BaseServiceImpl<PurchaseCheckMappe
         }
 
         if(StringUtils.isNotBlank(entry.getCheckUserName())){
-            wrapper.eq(PurchaseCheck::getCheckUserName,entry.getCheckUserName());
+            wrapper.like(PurchaseCheck::getCheckUserName,entry.getCheckUserName());
         }
 
         if(StringUtils.isNotBlank(entry.getCheckUserName())){
@@ -83,6 +83,9 @@ public class PurchaseCheckServiceImpl extends BaseServiceImpl<PurchaseCheckMappe
         if(StringUtils.isNotBlank(entry.getCheckDateEnd())){
             wrapper.le(PurchaseCheck::getCheckDate,entry.getCheckDateEnd());
         }
+        if(entry.getCreateDept() != null){
+            wrapper.eq(PurchaseCheck::getCreateDept,entry.getCreateDept());
+        }
         wrapper.eq(BaseEntity::getIsDeleted,0);
         wrapper.orderByDesc(PurchaseCheck::getCreateTime);
         IPage<PurchaseCheck> page = this.page(Condition.getPage(query), wrapper);
@@ -96,6 +99,7 @@ public class PurchaseCheckServiceImpl extends BaseServiceImpl<PurchaseCheckMappe
         entry.setBusinessCode("CGYS"+ DateFormatUtils.format(date,"yyyyMMddhhmmss")+ StringUtil.randomUUID().substring(0,5));
         entry.setCreateUser(AuthUtil.getUserId());
         entry.setCreateTime(date);
+        entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
         entry.setOriginatorId(AuthUtil.getUserId().toString());
         baseMapper.insert(entry);
         //根据采购申请id更新采购申请单