LY 修改离职日期

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

@@ -130,6 +130,9 @@ public class TMeasureRecordController extends BaseController {
                 TMeasureRecord r2 = list.get(1);
                 BigDecimal i = new BigDecimal(r2.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN).subtract(new BigDecimal(r1.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN));
                 int day = formatDate(r1.getMeasureDate(), r2.getMeasureDate());
+                if (day == 0) {
+                    day = day + 1;
+                }
                 logger.info(i + "----" + day);
                 BigDecimal di = new BigDecimal(day).divide(new BigDecimal(365), 4, BigDecimal.ROUND_HALF_DOWN);
                 logger.info(di + "----");
@@ -243,6 +246,7 @@ public class TMeasureRecordController extends BaseController {
                 Long id = this.tMeasureThicknessMapper.selectByRecord(t);
                 logger.info(id.toString());
                 t.setMeasureId(id.toString());
+//                this.tMeasureRecordService.deleteTMeasureRecordByDate(t);
                 this.tMeasureRecordService.insertTMeasureRecord(t);
                 this.updateMeasure(id + "");
                 successNumber++;

master/src/main/java/com/ruoyi/project/sems/mapper/TMeasureRecordMapper.java

@@ -66,4 +66,5 @@ public interface TMeasureRecordMapper extends BaseMapper<TMeasureRecord>
      */
     public int deleteTMeasureRecordByIds(Long[] ids);
 
+    void deleteTMeasureRecordByDate(TMeasureRecord t);
 }

master/src/main/java/com/ruoyi/project/sems/service/ITMeasureRecordService.java

@@ -62,4 +62,6 @@ public interface ITMeasureRecordService  extends IService<TMeasureRecord>
     public int deleteTMeasureRecordById(Long id);
 
     List<TMeasureRecord> queryRecords(String id);
+
+    void deleteTMeasureRecordByDate(TMeasureRecord t);
 }

master/src/main/java/com/ruoyi/project/sems/service/impl/TMeasureRecordServiceImpl.java

@@ -99,4 +99,9 @@ public class TMeasureRecordServiceImpl extends ServiceImpl<TMeasureRecordMapper,
     public List<TMeasureRecord> queryRecords(String measureId) {
         return this.list(new QueryWrapper<TMeasureRecord>().eq(!StringUtils.isEmpty(measureId),"MEASURE_ID", measureId) .orderByDesc("MEASURE_DATE"));
     }
+
+    @Override
+    public void deleteTMeasureRecordByDate(TMeasureRecord t) {
+        tMeasureRecordMapper.deleteTMeasureRecordByDate(t);
+    }
 }

master/src/main/resources/mybatis/sems/TMeasureRecordMapper.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.mapper.TMeasureRecordMapper">
-    
+
     <resultMap type="TMeasureRecord" id="TMeasureRecordResult">
         <result property="id"    column="id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTMeasureRecordList" parameterType="TMeasureRecord" resultMap="TMeasureRecordResult">
         <include refid="selectTMeasureRecordVo"/>
-        <where>  
+        <where>
             <if test="measureId != null  and measureId != ''"> and measure_id = #{measureId}</if>
             <if test="measureValue != null "> and measure_value = #{measureValue}</if>
             <if test="measureDate != null "> and measure_date = #{measureDate}</if>
@@ -31,12 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by measure_date desc
     </select>
-    
+
     <select id="selectTMeasureRecordById" parameterType="Long" resultMap="TMeasureRecordResult">
         <include refid="selectTMeasureRecordVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTMeasureRecord" parameterType="TMeasureRecord">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_measure_record.NEXTVAL as id FROM DUAL
@@ -91,5 +91,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+    <update id="deleteTMeasureRecordByDate"  parameterType="TMeasureRecord">
+        update t_measure_record set del_flag = 2
+        <where>
+            <if test="measureId != null  and measureId != ''"> and measure_id = #{measureId}</if>
+            <if test="measureDate != null "> and measure_date = #{measureDate}</if>
+        </where>
+
+    </update>
+
+
+
+</mapper>