LY bug fix

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/YhzgTaskCreateListener.java

@@ -39,7 +39,6 @@ public class YhzgTaskCreateListener implements Serializable, TaskListener {
         bookingworkticket.setStatus(0L);
         tInvoiceBookingworkticketService.updateTInvoiceBookingworkticket(bookingworkticket);
         logger.info("approveEntity:" + approveEntity);
-        if (DateUtils.compareToDay(bookingworkticket.getWorkStartTime(), bookingworkticket.getCreatedate()) == 0) {
             logger.info("==============================发邮件============================");
             //发送邮件
             try {
@@ -93,7 +92,6 @@ public class YhzgTaskCreateListener implements Serializable, TaskListener {
             } catch (Exception e) {
                 logger.error("邮件发送失败" + JSON.toJSONString(e));
             }
-        }
     }
 
 }

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzzgTaskCreateListener.java

@@ -39,6 +39,7 @@ public class ZzzgTaskCreateListener implements Serializable, TaskListener {
         bookingworkticket.setStatus(2L);
         tInvoiceBookingworkticketService.updateTInvoiceBookingworkticket(bookingworkticket);
         logger.info("approveEntity:" + approveEntity);
+        //当天的工作票发送邮件
         if (DateUtils.compareToDay(bookingworkticket.getWorkStartTime(), bookingworkticket.getCreatedate()) == 0) {
             logger.info("==============================发邮件============================");
             //发送邮件

master/src/main/resources/mybatis/plant/TStaffmgrMapper.xml

@@ -218,6 +218,14 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="actualposts != null  and actualposts != ''">
+                and
+                actualpost in
+                <foreach collection="actualposts.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             and d.del_flag in (0 , 9)
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/training/TTrainingrecordsMapper.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.training.mapper.TTrainingrecordsMapper">
-    
+
     <resultMap type="TTrainingrecords" id="TTrainingrecordsResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTTrainingrecordsList" parameterType="TTrainingrecords" resultMap="TTrainingrecordsResult">
         <include refid="selectTTrainingrecordsVo"/>
-        <where>  
+        <where>
             <if test="year != null "> and year = #{year}</if>
             <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
             <if test="employeeid != null  and employeeid != ''"> and employeeid like concat(concat('%', #{employeeid}), '%')</if>
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTTrainingrecordsById" parameterType="Long" resultMap="TTrainingrecordsResult">
         <include refid="selectTTrainingrecordsVo"/>
         where id = #{id}
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTTrainingrecordsVo"/>
         where d.staff_id = #{id}
     </select>
-        
+
     <insert id="insertTTrainingrecords" parameterType="TTrainingrecords">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_trainingrecords.NEXTVAL as id FROM DUAL
@@ -215,5 +215,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>