李扬

master/src/main/java/com/ruoyi/project/sems/controller/SpecHomeController.java

@@ -41,6 +41,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -141,9 +142,11 @@ public class SpecHomeController extends BaseController
             }
             allLength += gdLength;
         }
+        DecimalFormat df = new DecimalFormat("#");
+        System.out.println(df.format(allLength));
         Map<String, Object> mapylgd = new HashMap<String, Object>();
         mapylgd.put("ylgdAll_num", ylgdAll);
-        mapylgd.put("ylgd_length", allLength);
+        mapylgd.put("ylgd_length", df.format(allLength));
         //压力容器
         int ylrqAll = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)

master/src/main/java/com/ruoyi/project/sems/his/controller/TApproveSpecModifyController.java

@@ -3,6 +3,7 @@ package com.ruoyi.project.sems.his.controller;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.project.approve.damain.DevTask;
 import com.ruoyi.project.sems.domain.*;
 import com.ruoyi.project.sems.his.domain.*;
@@ -307,7 +308,9 @@ public class TApproveSpecModifyController extends BaseController
                         tSpecCheckService.insertTSpecCheck(tc);
 
                         if (tApproveSpecModify.getApproveType() == 1) {
-                            TSpechiYlrq hientity = tSpechiYlrqService.selectTSpechiYlrqById(Long.parseLong(tApproveSpecModify.getApNo()));
+                            logger.info(JSON.toJSONString(tApproveSpecModify));
+                            TSpechiYlrq hientity = tSpechiYlrqService.selectTSpechiYlrqById(Long.parseLong(tApproveSpecModify.getDevId()));
+                            logger.info(JSON.toJSONString(hientity));
                             tSpecdevYlrqService.updateTSpecdevYlrqByHi(hientity);
                         }else {
                             tSpecdevYlrqService.deleteTSpecdevYlrqById(Long.parseLong(i));
@@ -334,7 +337,7 @@ public class TApproveSpecModifyController extends BaseController
                         tc.setSafeClass(ylgdEntity.getSafeClass());
                         tSpecCheckService.insertTSpecCheck(tc);
                         if (tApproveSpecModify.getApproveType() == 1) {
-                            TSpechiYlgd hientity = tSpechiYlgdService.selectTSpechiYlgdById(Long.parseLong(tApproveSpecModify.getApNo()));
+                            TSpechiYlgd hientity = tSpechiYlgdService.selectTSpechiYlgdById(Long.parseLong(tApproveSpecModify.getDevId()));
                             tSpecdevYlgdService.updateTSpecdevYlgdByHi(hientity);
                         }else {
                             tSpecdevYlgdService.deleteTSpecdevYlgdById(Long.parseLong(i));
@@ -356,7 +359,7 @@ public class TApproveSpecModifyController extends BaseController
                         tc.setWarnDate(dzsbEntity.getWarnDate());
                         tSpecCheckService.insertTSpecCheck(tc);
                         if (tApproveSpecModify.getApproveType() == 1){
-                            TSpechiDzsb hientity = tSpechiDzsbService.selectTSpechiDzsbById(Long.parseLong(tApproveSpecModify.getApNo()));
+                            TSpechiDzsb hientity = tSpechiDzsbService.selectTSpechiDzsbById(Long.parseLong(tApproveSpecModify.getDevId()));
                             tSpecdevDzsbService.updateTSpecdevDzsbByHi(hientity);
                         } else {
                             tSpecdevDzsbService.deleteTSpecdevDzsbById(Long.parseLong(i));
@@ -382,7 +385,7 @@ public class TApproveSpecModifyController extends BaseController
                         tc.setOutNextWarnDate(glEntity.getOutNextWarnDate());
                         tSpecCheckService.insertTSpecCheck(tc);
                         if (tApproveSpecModify.getApproveType() == 1){
-                            TSpechiGl hientity = tSpechiGlService.selectTSpechiGlById(Long.parseLong(tApproveSpecModify.getApNo()));
+                            TSpechiGl hientity = tSpechiGlService.selectTSpechiGlById(Long.parseLong(tApproveSpecModify.getDevId()));
                             tSpecdevGlService.updateTSpecdevGlByHi(hientity);
                         } else {
                             tSpecdevGlService.deleteTSpecdevGlById(Long.parseLong(i));
@@ -404,7 +407,7 @@ public class TApproveSpecModifyController extends BaseController
                         tc.setWarnDate(dtEntity.getWarnDate());
                         tSpecCheckService.insertTSpecCheck(tc);
                         if (tApproveSpecModify.getApproveType() == 1){
-                            TSpechiDt hientity = tSpechiDtService.selectTSpechiDtById(Long.parseLong(tApproveSpecModify.getApNo()));
+                            TSpechiDt hientity = tSpechiDtService.selectTSpechiDtById(Long.parseLong(tApproveSpecModify.getDevId()));
                             tSpecdevDtService.updateTSpecdevDtByHi(hientity);
                         } else {
                             tSpecdevDtService.deleteTSpecdevDtById(Long.parseLong(i));
@@ -426,7 +429,7 @@ public class TApproveSpecModifyController extends BaseController
                         tc.setWarnDate(ccEntity.getWarnDate());
                         tSpecCheckService.insertTSpecCheck(tc);
                         if (tApproveSpecModify.getApproveType() == 1){
-                            TSpechiCc hientity = tSpechiCcService.selectTSpechiCcById(Long.parseLong(tApproveSpecModify.getApNo()));
+                            TSpechiCc hientity = tSpechiCcService.selectTSpechiCcById(Long.parseLong(tApproveSpecModify.getDevId()));
                             tSpecdevCcService.updateTSpecdevCcByHi(hientity);
                         } else {
                             tSpecdevCcService.deleteTSpecdevCcById(Long.parseLong(i));

master/src/main/resources/mybatis/sems/his/TSpechiCcMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.his.mapper.TSpechiCcMapper">
-    
+
     <resultMap type="TSpechiCc" id="TSpechiCcResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpechiCcList" parameterType="TSpechiCc" resultMap="TSpechiCcResult">
         <include refid="selectTSpechiCcVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -107,10 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTSpechiCcById" parameterType="Long" resultMap="TSpechiCcResult">
         <include refid="selectTSpechiCcVo"/>
-        where d.id = #{id}
+        where d.dev_id = #{id}
         and d.hi_type = 1
         and d.del_flag = 0
     </select>
@@ -384,4 +384,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="deleteTSpechiCcByDevId" parameterType="Long">
         update t_spechi_cc set del_flag = 2 where dev_id = #{devId} and hi_type = 1
     </update>
-</mapper>
+</mapper>

master/src/main/resources/mybatis/sems/his/TSpechiDtMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.his.mapper.TSpechiDtMapper">
-    
+
     <resultMap type="TSpechiDt" id="TSpechiDtResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpechiDtList" parameterType="TSpechiDt" resultMap="TSpechiDtResult">
         <include refid="selectTSpechiDtVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -93,10 +93,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTSpechiDtById" parameterType="Long" resultMap="TSpechiDtResult">
         <include refid="selectTSpechiDtVo"/>
-        where d.id = #{id}
+        where d.dev_id = #{id}
         and d.hi_type = 1
         and d.del_flag = 0
     </select>
@@ -336,4 +336,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="deleteTSpechiDtByDevId" parameterType="Long">
         update t_spechi_dt set del_flag = 2 where dev_id = #{devId} and hi_type = 1
     </update>
-</mapper>
+</mapper>

master/src/main/resources/mybatis/sems/his/TSpechiDzsbMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.his.mapper.TSpechiDzsbMapper">
-    
+
     <resultMap type="TSpechiDzsb" id="TSpechiDzsbResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpechiDzsbList" parameterType="TSpechiDzsb" resultMap="TSpechiDzsbResult">
         <include refid="selectTSpechiDzsbVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -93,10 +93,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTSpechiDzsbById" parameterType="Long" resultMap="TSpechiDzsbResult">
         <include refid="selectTSpechiDzsbVo"/>
-        where d.id = #{id}
+        where d.dev_id = #{id}
         and d.hi_type = 1
         and d.del_flag = 0
     </select>
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and d.hi_type = 0
         and d.del_flag = 0
     </select>
-        
+
     <insert id="insertTSpechiDzsb" parameterType="TSpechiDzsb">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_spechi_dzsb.NEXTVAL as id FROM DUAL
@@ -335,4 +335,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="deleteTSpechiDzsbByDevId" parameterType="Long">
         update t_spechi_dzsb set del_flag = 2 where dev_id = #{devId} and hi_type = 1
     </update>
-</mapper>
+</mapper>

master/src/main/resources/mybatis/sems/his/TSpechiGlMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.his.mapper.TSpechiGlMapper">
-    
+
     <resultMap type="TSpechiGl" id="TSpechiGlResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpechiGlList" parameterType="TSpechiGl" resultMap="TSpechiGlResult">
         <include refid="selectTSpechiGlVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -107,10 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTSpechiGlById" parameterType="Long" resultMap="TSpechiGlResult">
         <include refid="selectTSpechiGlVo"/>
-        where d.id = #{id}
+        where d.dev_id = #{id}
         and d.hi_type = 1
         and d.del_flag = 0
     </select>
@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and d.hi_type = 0
         and d.del_flag = 0
     </select>
-        
+
     <insert id="insertTSpechiGl" parameterType="TSpechiGl">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_spechi_gl.NEXTVAL as id FROM DUAL
@@ -386,4 +386,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
 
-</mapper>
+</mapper>

master/src/main/resources/mybatis/sems/his/TSpechiYlgdMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.his.mapper.TSpechiYlgdMapper">
-    
+
     <resultMap type="TSpechiYlgd" id="TSpechiYlgdResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpechiYlgdList" parameterType="TSpechiYlgd" resultMap="TSpechiYlgdResult">
         <include refid="selectTSpechiYlgdVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -129,10 +129,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTSpechiYlgdById" parameterType="Long" resultMap="TSpechiYlgdResult">
         <include refid="selectTSpechiYlgdVo"/>
-        where d.id = #{id}
+        where d.dev_id = #{id}
         and d.hi_type = 1
         and d.del_flag = 0
     </select>
@@ -461,5 +461,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="deleteTSpechiYlgdByDevId" parameterType="Long">
         update t_spechi_ylgd set del_flag = 2 where dev_id = #{devId} and hi_type = 1
     </update>
-    
-</mapper>
+
+</mapper>

master/src/main/resources/mybatis/sems/his/TSpechiYlrqMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.his.mapper.TSpechiYlrqMapper">
-    
+
     <resultMap type="TSpechiYlrq" id="TSpechiYlrqResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpechiYlrqList" parameterType="TSpechiYlrq" resultMap="TSpechiYlrqResult">
         <include refid="selectTSpechiYlrqVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -115,21 +115,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTSpechiYlrqById" parameterType="Long" resultMap="TSpechiYlrqResult">
         <include refid="selectTSpechiYlrqVo"/>
-        where d.id = #{id}
+        where d.DEV_ID = #{id}
         and d.hi_type = 1
         and d.del_flag = 0
     </select>
-    
+
     <select id="selectTSpechiYlrqByReform" parameterType="Long" resultMap="TSpechiYlrqResult">
         <include refid="selectTSpechiYlrqVo"/>
         where d.dev_id = #{devId}
         and d.hi_type = 0
         and d.del_flag = 0
     </select>
-        
+
     <insert id="insertTSpechiYlrq" parameterType="TSpechiYlrq">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_spechi_ylrq.NEXTVAL as id FROM DUAL
@@ -412,4 +412,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="deleteTSpechiYlrqByDevId" parameterType="Long">
         update t_spechi_ylrq set del_flag = 2 where dev_id = #{devId} and hi_type = 1
     </update>
-</mapper>
+</mapper>