总查询添加

src/main/java/com/spring/modules/material/controller/SendEmailController.java

@@ -17,7 +17,7 @@ public class SendEmailController {
 
     @RequestMapping("/getEmail")
     public R getEmail(){
-        SendEmail sendEmail= sendEmailService.getById(1);
+        SendEmail sendEmail= sendEmailService.getEmail();
         return R.ok().put("rows",sendEmail);
     }
     @RequestMapping("/saveEmail")

src/main/java/com/spring/modules/material/service/Impl/SendEmailServiceImpl.java

@@ -1,6 +1,5 @@
 package com.spring.modules.material.service.Impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.spring.modules.material.dao.SendEmailMapper;
 import com.spring.modules.material.entity.SendEmail;
@@ -8,6 +7,8 @@ import com.spring.modules.material.service.SendEmailService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @Slf4j
 public class SendEmailServiceImpl extends ServiceImpl<SendEmailMapper, SendEmail> implements SendEmailService {
@@ -15,6 +16,7 @@ public class SendEmailServiceImpl extends ServiceImpl<SendEmailMapper, SendEmail
 
     @Override
     public SendEmail getEmail() {
-        return null;
+        List<SendEmail> list = this.list();
+        return list.get(0);
     }
 }

src/main/java/com/spring/modules/warehouse/controller/FindInfoController.java

@@ -0,0 +1,26 @@
+package com.spring.modules.warehouse.controller;
+
+import com.spring.common.utils.R;
+import com.spring.modules.warehouse.entity.AllFindEntity;
+import com.spring.modules.warehouse.service.FindInfoService;
+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 java.text.ParseException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/find/info")
+public class FindInfoController {
+    @Autowired
+    private FindInfoService findInfoService;
+
+    @PostMapping("/findAll")
+    private R findAll(@RequestBody AllFindEntity allFindEntity)throws ParseException {
+        List<AllFindEntity> list=findInfoService.findAll(allFindEntity);
+        return R.ok().put("rows",list);
+    }
+}

src/main/java/com/spring/modules/warehouse/dao/FindInfoMapper.java

@@ -0,0 +1,9 @@
+package com.spring.modules.warehouse.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.spring.modules.warehouse.entity.AllFindEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FindInfoMapper extends BaseMapper<AllFindEntity> {
+}

src/main/java/com/spring/modules/warehouse/entity/AllFindEntity.java

@@ -0,0 +1,63 @@
+package com.spring.modules.warehouse.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AllFindEntity {
+    //工厂ID
+    private String site;
+    //产品卷号
+    @JSONField(name = "RollNo")
+    private String rollNo;
+    //产品料号
+    @JSONField(name = "Part_no")
+    private String partNo;
+    //产品名称
+    @JSONField(name = "Part_Desc")
+    private String partDesc;
+    //原材料卷号
+    @JSONField(name = "RM_RollNo")
+    private String rMRollNo;
+    //材料采购单号
+    @JSONField(name = "RMRoll_PONo")
+    private String rMRollPONo;
+    //材料入库日期
+    @JSONField(name = "RMRoll_ReceiveDate")
+    private Date rMRollReceiveDate;
+    //材料入库单号
+    @JSONField(name = "RMRoll_ReceiveNo")
+    private String rMRollReceiveNo;
+    //生产订单号
+    @JSONField(name = "SOOrderNo")
+    private String soOrderNo;
+    //模切日期
+    @JSONField(name = "Roll_ProductionDate1")
+    private Date rollProductionDate1;
+    //模切操作员
+    @JSONField(name = "Roll_Producedby1")
+    private String rollProducedby1;
+    //FQC检验日期
+    @JSONField(name = "Roll_ProductionDate2")
+    private Date rollProductionDate2;
+    //FQC检验员
+    @JSONField(name = "Roll_Producedby2")
+    private String rollProducedby2;
+    //成品卷入库单号
+    @JSONField(name = "ReceiveNo")
+    private String receiveNo;
+    //成品卷入库日期
+    @JSONField(name = "ReceiveDate")
+    private Date receiveDate;
+    //成品卷失效日期
+    @JSONField(name = "Expiration_Date")
+    private Date expirationDate;
+    //成品卷发货单号
+    @JSONField(name = "ShipNo")
+    private String shipNo;
+    //成品卷发货日期
+    @JSONField(name = "ShipDate")
+    private Date shipDate;
+}

src/main/java/com/spring/modules/warehouse/service/FindInfoService.java

@@ -0,0 +1,14 @@
+package com.spring.modules.warehouse.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.spring.modules.warehouse.entity.AllFindEntity;
+
+import java.text.ParseException;
+import java.util.List;
+
+public interface FindInfoService extends IService<AllFindEntity> {
+
+
+    List<AllFindEntity> findAll(AllFindEntity allFindEntity) throws ParseException;
+}

src/main/java/com/spring/modules/warehouse/service/Impl/FindInfoServiceImpl.java

@@ -0,0 +1,71 @@
+package com.spring.modules.warehouse.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.Gson;
+import com.spring.modules.report.dao.ProcedureDao;
+import com.spring.modules.warehouse.dao.FindInfoMapper;
+import com.spring.modules.warehouse.entity.AllFindEntity;
+import com.spring.modules.warehouse.service.FindInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class FindInfoServiceImpl extends ServiceImpl<FindInfoMapper, AllFindEntity> implements FindInfoService {
+
+    @Autowired
+    private ProcedureDao procedureDao;
+
+    @Override
+    public List<AllFindEntity> findAll(AllFindEntity allFindEntity) throws ParseException {
+        List<Object> params = new ArrayList<>();
+        String site = allFindEntity.getSite();
+        String RollNo =allFindEntity.getRollNo();
+        params.add(site);
+        params.add(RollNo);
+        List<Map<String, Object>> resultList = procedureDao.getProcedureData("Get_AllRelatedInfobyRollNo", params);
+        if (CollectionUtils.isEmpty(resultList)){
+            return new ArrayList<>();
+        }
+
+        ArrayList<AllFindEntity> list = new ArrayList<>();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (Map<String, Object> map : resultList) {
+            Gson gson = new Gson();
+            String s = gson.toJson(map);
+            AllFindEntity allFindEntity1 = gson.fromJson(s, AllFindEntity.class);
+
+            AllFindEntity allFind = new AllFindEntity();
+            allFind.setSite(allFindEntity1.getSite());
+            allFind.setRollNo(allFindEntity1.getRollNo());
+            allFind.setPartNo(allFindEntity1.getPartNo());
+            allFind.setPartDesc(allFindEntity1.getPartDesc());
+            allFind.setRMRollNo(allFindEntity1.getRMRollNo());
+            allFind.setRMRollPONo(allFindEntity1.getRMRollPONo());
+            allFind.setRMRollReceiveDate(allFindEntity1.getRMRollReceiveDate());
+            allFind.setRMRollReceiveNo(allFindEntity1.getReceiveNo());
+            allFind.setSoOrderNo(allFindEntity1.getSoOrderNo());
+            allFind.setRollProductionDate1(allFindEntity1.getRollProductionDate1());
+            allFind.setRollProducedby1(allFindEntity1.getRollProducedby1());
+            allFind.setRollProductionDate2(allFindEntity1.getRollProductionDate2());
+            allFind.setRollProducedby2(allFindEntity1.getRollProducedby2());
+            allFind.setReceiveNo(allFindEntity1.getReceiveNo());
+            allFind.setReceiveDate(allFindEntity1.getReceiveDate());
+            allFind.setExpirationDate(allFindEntity1.getExpirationDate());
+            allFind.setReceiveNo(allFindEntity1.getReceiveNo());
+            allFind.setShipDate(allFindEntity1.getShipDate());
+            list.add(allFind);
+        }
+
+        return list;
+    }
+
+}