ly 3 år sedan
förälder
incheckning
acab1c741e

+ 6 - 0
master/src/main/java/com/ruoyi/common/thread/SpecDevYlgdThread.java

@@ -25,6 +25,12 @@ public class SpecDevYlgdThread implements Runnable {
         List<TSpecdevYlgd> list = this.specdevYlgdService.list(new QueryWrapper<TSpecdevYlgd>()
                 .eq("del_flag", 0).eq("status", "1"));
         logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevYlgd t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevYlgdService.updateTSpecdevYlgd(t);
+        }
         for (TSpecdevYlgd tSpecdevYlgd : list) {
             for (TSpecdevYlgd specdevYlgd : list) {
                 if (tSpecdevYlgd.getId() == specdevYlgd.getId() || StringUtils.isEmpty(tSpecdevYlgd.getDevno())

+ 4 - 0
master/src/main/java/com/ruoyi/common/thread/SpecDevYlrqThread.java

@@ -31,6 +31,10 @@ public class SpecDevYlrqThread implements Runnable {
             tSpecdevYlrq.setIsRepeat(1L);
             this.specdevYlrqService.updateTSpecdevYlrq(tSpecdevYlrq);
         }*/
+        for (TSpecdevYlrq t : list) {
+            t.setIsRepeat(0L);
+            this.specdevYlrqService.updateTSpecdevYlrq(t);
+        }
         for (TSpecdevYlrq tSpecdevYlrq : list) {
             for (TSpecdevYlrq specdevYlrq : list) {
                 if (tSpecdevYlrq.getId() == specdevYlrq.getId() || StringUtils.isEmpty(tSpecdevYlrq.getDevno())

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

@@ -146,7 +146,7 @@ public class SpecHomeController extends BaseController
             }
             allLength += gdLength;
         }
-        DecimalFormat df = new DecimalFormat("#");
+        DecimalFormat df = new DecimalFormat("0.00#");
         System.out.println(df.format(allLength));
         Map<String, Object> mapylgd = new HashMap<String, Object>();
         mapylgd.put("ylgdAll_num", ylgdAll);

+ 0 - 3
master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -112,11 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>-->
             and d.del_flag = 0
         </where>
-
     </select>
 
-
-
     <select id="selectTSpecdevCcById" parameterType="Long" resultMap="TSpecdevCcResult">
         <include refid="selectTSpecdevCcVo"/>
         where id = #{id}