评估流程

2021-07-21 10:52:22 +08:00
parent b564ff964a
commit 7d890e7fcd
17 changed files with 134 additions and 50 deletions
@@ -34,7 +34,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URLEncoder;
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;

 /**
@@ -55,6 +57,18 @@ public class SarStandUnqualifiedController extends BaseController<SarStandUnqual
    @Autowired
    private ISarStandUnqualifiedService sarStandUnqualifiedService;

+    @ApiOperation("未符合项整改新增")
+    @PostMapping("/add")
+    public ResponseMessage<Object> add(@RequestBody List<SarStandUnqualified> sarStandUnqualified){
+        sarStandUnqualified.forEach(sarStandUnqualified1 -> sarStandUnqualified1.setCreateTime(new Date()));
+        if (sarStandUnqualifiedService.saveBatch(sarStandUnqualified)) {
+            return Result.success("新增成功");
+        }
+        else{
+            return Result.error("新增失败");
+        }
+    }
+
    /**
     * 分页查询未符合项
     * @param sarStandUnqualifiedPage：筛选、分页信息
@@ -1,7 +1,14 @@
 package com.adc.da.slrs.sarStandUnqualified.dao;

 import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
+import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;

 /**
 * <p>
@@ -12,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @since 2021-06-15
 */
 public interface SarStandUnqualifiedDao extends BaseMapper<SarStandUnqualified> {
-
+    IPage<SarStandUnqualified> getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
 }
@@ -3,11 +3,13 @@ package com.adc.da.slrs.sarStandUnqualified.entity;
 import com.adc.da.base.entity.BaseEntity;

 import java.sql.Timestamp;
+import java.util.Date;

 import com.adc.da.slrs.sarStandUnqualified.utils.ProductTypeConverter;
 import com.adc.da.slrs.sarStandUnqualified.utils.TimestampConverter;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -84,7 +86,7 @@ public class SarStandUnqualified extends BaseEntity {
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField("CREATE_TIME")
-    private Timestamp createTime;
+    private Date createTime;

    @ExcelIgnore
    @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）")
@@ -96,14 +98,14 @@ public class SarStandUnqualified extends BaseEntity {
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField("ACTUAL_CLOSE_TIME")
-    private Timestamp actualCloseTime;
+    private Date actualCloseTime;

    @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class)
    @ApiModelProperty(value = "计划关闭时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField("PLAN_CLOSE_TIME")
-    private Timestamp planCloseTime;
+    private Date planCloseTime;

    @ApiModelProperty(value = "未符合原因")
    @TableField("REASON")
@@ -133,8 +135,18 @@ public class SarStandUnqualified extends BaseEntity {

    @ExcelIgnore
    @ApiModelProperty(value = "主键")
-    @TableId("ID")
+    @TableId(type = IdType.UUID)
    private String id;


+    @ApiModelProperty(value = "质量工程师")
+    private String qaEngineerName;
+
+    @ApiModelProperty(value = "认证工程师")
+    private String authEngineerName;
+
+    @ApiModelProperty(value = "责任工程师")
+    private String dutyEngineerName;
+
+
 }
@@ -46,4 +46,5 @@ public interface ISarStandUnqualifiedService extends IService<SarStandUnqualifie
     * @return List<SarStandUnqualified>
     */
    List<SarStandUnqualified> getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO);
+
 }
@@ -40,25 +40,28 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     */
    @Override
    public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
-        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"));
-//            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
-        }
-        //仅查询未关闭的
-        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
-        if(sarStandUnqualifiedPage.getProductName()!=null){
-            sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%");
-        }
-        if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
-            sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
-        }
-        Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
-        //判断前端是否提供页码和每页条数
-        if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){
-            standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
-        }
-        return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper);
+//        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+//        if(sarStandUnqualifiedPage.getStandId()!=null){
+//            sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"));
+////            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
+//        }
+//        //仅查询未关闭的
+//        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
+//        if(sarStandUnqualifiedPage.getProductName()!=null){
+//            sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%");
+//        }
+//        if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
+//            sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
+//        }
+//        Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
+//        //判断前端是否提供页码和每页条数
+//        if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){
+//            standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
+//        }
+        Page pag = new Page();
+        pag.setCurrent(sarStandUnqualifiedPage.getCurrent()).setSize(sarStandUnqualifiedPage.getSize());
+
+        return sarStandUnqualifiedDao.getAllDatasByPage(pag,sarStandUnqualifiedPage);
    }

    /**