2024-02-02

系统优化

src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java

@@ -11,10 +11,10 @@ import java.util.List;
 public class EamWorkOrderInData extends  EamWorkOrderData{
     private String objectDesc;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startDate;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endDate;
     private String userId;
     private String planOperatorName;

src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java

@@ -221,6 +221,8 @@ public class QcFAIRecordData extends QueryPage {
     private String methodName;
     // 检验方法说明
     private String methodRemark;
+    // 送检总数
+    private Double sjzs;
     /**
      * site + bu
      */
@@ -238,6 +240,14 @@ public class QcFAIRecordData extends QueryPage {
      */
     private String buDesc;
 
+    public Double getSjzs() {
+        return sjzs;
+    }
+
+    public void setSjzs(Double sjzs) {
+        this.sjzs = sjzs;
+    }
+
     public String getBu() {
         return bu;
     }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -1657,7 +1657,11 @@ public class EamServiceImpl implements EamService {
         }
         inData.setActualOperator(check.get(0).getAdminID());
 
-        if ("B".equals(inData.getFunctionType()) || "A".equals(inData.getFunctionType())) {
+        if ("A".equals(inData.getFunctionType())) {
+            inData.setReachDate(inData.getStartDate());
+            inData.setActualDate(inData.getEndDate());
+        }
+        if ("B".equals(inData.getFunctionType())) {
             // 获取当前时间为实际执行时间
             String dateNow = DateUtils.getStringNow();
             Date actualDate = DateUtils.getStringToDate(dateNow, "yyyy-MM-dd HH:mm:ss");
@@ -1807,7 +1811,7 @@ public class EamServiceImpl implements EamService {
             }
         }
        // eamMapper.closePlanWithCheck(inData);
-        if ("B".equals(inData.getFunctionType())){
+        if ("B".equals(inData.getFunctionType())) {
             // 添加维保协同人员
             if (inData.getOperator() != null && !"".equals(inData.getOperator())){
                 String[] operatorList = inData.getOperator().split(";");
@@ -1817,7 +1821,7 @@ public class EamServiceImpl implements EamService {
                 }
             }
             // 如果维保异常则重新生成工单
-            if ("异常".equals(inData.getCheckResult())){
+            if ("异常".equals(inData.getCheckResult())) {
                 // 获取旧工单的基础信息
                 EamWorkOrderInData oldDate = eamMapper.queryOldWorkOrderMessage(inData);
                 inData.setPlanOperator(oldDate.getPlanOperator());

src/main/java/com/xujie/sys/modules/sys/controller/SysRoleController.java

@@ -35,7 +35,7 @@ public class SysRoleController extends AbstractController {
 	 * 角色列表
 	 */
 	@GetMapping("/list")
-	@RequiresPermissions("sys:role:list")
+	@RequiresPermissions("998002:search")
 	public R list(@RequestParam Map<String, Object> params){
 		//如果不是超级管理员，则只查询自己创建的角色列表
 //		if(getUserId() != Constant.SUPER_ADMIN){
@@ -61,7 +61,7 @@ public class SysRoleController extends AbstractController {
 	 * 角色列表
 	 */
 	@GetMapping("/select")
-	@RequiresPermissions("sys:role:select")
+//	@RequiresPermissions("sys:role:select")
 	public R select(){
 		Map<String, Object> map = new HashMap<>();
 		
@@ -78,7 +78,7 @@ public class SysRoleController extends AbstractController {
 	 * 角色信息
 	 */
 	@GetMapping("/info/{roleId}")
-	@RequiresPermissions("sys:role:info")
+//	@RequiresPermissions("sys:role:info")
 	public R info(@PathVariable("roleId") Long roleId){
 		SysRoleEntity role = sysRoleService.getById(roleId);
 		
@@ -94,7 +94,7 @@ public class SysRoleController extends AbstractController {
 	 */
 	@SysLog("保存角色")
 	@PostMapping("/save")
-	@RequiresPermissions("sys:role:save")
+//	@RequiresPermissions("sys:role:save")
 	public R save(@RequestBody SysRoleEntity role){
 		ValidatorUtils.validateEntity(role);
 		
@@ -109,7 +109,7 @@ public class SysRoleController extends AbstractController {
 	 */
 	@SysLog("修改角色")
 	@PostMapping("/update")
-	@RequiresPermissions("sys:role:update")
+//	@RequiresPermissions("sys:role:update")
 	public R update(@RequestBody SysRoleEntity role){
 		ValidatorUtils.validateEntity(role);
 		
@@ -124,7 +124,7 @@ public class SysRoleController extends AbstractController {
 	 */
 	@SysLog("删除角色")
 	@PostMapping("/delete")
-	@RequiresPermissions("sys:role:delete")
+//	@RequiresPermissions("sys:role:delete")
 	public R delete(@RequestBody Long[] roleIds){
 		sysRoleService.deleteBatch(roleIds);
 		

src/main/resources/mapper/pms/EamMapper.xml

@@ -1064,7 +1064,7 @@
            disposal_measures = #{disposalMeasures},
            WorkTime = CASE
                     WHEN (DATEDIFF(SECOND, reach_date, #{actualDate}) <![CDATA[<]]> 60) THEN DATEDIFF(SECOND, reach_date, #{actualDate}) / 60.0
-                    ELSE ceiling(floor(DATEDIFF(SECOND, reach_date, #{actualDate}) / 30) / 2)
+                    ELSE ceiling(floor(DATEDIFF(SECOND, reach_date, #{actualDate}) * 1.0 / 30) / 2)
                     END,
            result = #{result,jdbcType=VARCHAR},
            checkResult = #{checkResult},
@@ -1078,6 +1078,7 @@
         update eam_workOrder
         set Status = '待审核',
             ActualOperator = #{actualOperator},
+            reach_date = #{reachDate},
             ActualDate = #{actualDate},
             Remark = #{remark},
             disposal_measures = #{disposalMeasures},
@@ -2242,16 +2243,9 @@
         set update_by = #{mesUser},
             update_date = GetDate(),
             Remark = #{remark},
-            <if test='functionType == "B"'>
-                reach_date = #{reachDate},
-                ActualDate = #{actualDate},
-                WorkTime = CASE WHEN (DATEDIFF(SECOND, #{reachDate}, #{actualDate}) <![CDATA[<]]> 60) THEN DATEDIFF(SECOND, #{reachDate}, #{actualDate}) / 60.0
-                ELSE ceiling(floor(DATEDIFF(SECOND, #{reachDate}, #{actualDate}) / 30) / 2)
-                END,
-            </if>
-            <if test='functionType == "A"'>
-                WorkTime = #{workTime},
-            </if>
+            reach_date = #{reachDate},
+            ActualDate = #{actualDate},
+            WorkTime = #{workTime},
             <if test='functionType == "B" and checkResult == "合格"'>
                 disposal_measures = '',
             </if>
@@ -2375,7 +2369,7 @@
         DELETE FROM eam_family
         WHERE site = #{site} and bu_no = #{buNo} and FamilyID = #{familyID}
         <if test="sonId != null and sonId != ''">
-            son_id like #{sonId} + '%'
+            and son_id like #{sonId} + '%'
         </if>
     </delete>
 
@@ -2392,10 +2386,7 @@
             handling_method = #{handlingMethod},
             preventive_measure = #{preventiveMeasure},
             Remark = #{remark},
-            WorkTime = CASE
-                           WHEN (DATEDIFF(SECOND, #{reachDate}, #{actualDate}) <![CDATA[<]]> 60) THEN DATEDIFF(SECOND, #{reachDate}, #{actualDate}) / 60.0
-                           ELSE ceiling(floor(DATEDIFF(SECOND, #{reachDate}, #{actualDate}) / 30) / 2)
-                        END
+            WorkTime = #{workTime}
         where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo}
     </update>
 

src/main/resources/mapper/pms/QcMapper.xml

@@ -3088,7 +3088,8 @@
             t.lotsize,
             a.qtyrequired,
             c.operation_desc,
-            J.sku
+            J.sku,
+            (select sum(roll_qty) from qc_ipqc_record where order_no = #{query.orderNo}) as sjzs
         FROM
             soscheduledrouting AS a
                 inner JOIN so_routing AS c ON c.order_no = a.orderno