Merge remote-tracking branch 'origin/master'

bpm-core/src/main/java/com/srm/bpm/logic/query/list/ApprovedBillQuery.java

@@ -22,6 +22,8 @@ public class ApprovedBillQuery extends DraftBillQuery {
      * 发起人
      */
     private long sender;
+    
+    private String senderName;
 
 
 

bpm-core/src/main/java/com/srm/bpm/logic/query/list/DraftBillQuery.java

@@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.core.enums.SqlLike;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 
 import java.io.Serializable;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.util.Date;
 
 import lombok.Data;
 import com.srm.bpm.logic.constant.StringPool;
@@ -64,18 +67,30 @@ public class DraftBillQuery implements Serializable {
             return 0;
         } else {
             final String[] timeSplit = rangeTime.split(RANGE_TIME_DASH);
-            final LocalDate startDay = DateTimeUtil.str2Date(timeSplit[0]);
-            return DateTimeUtil.timeMillsOfStartDate(startDay) / 1000;
+            String startDay = timeSplit[0];
+			try {
+				Date startDate = new SimpleDateFormat("yyyy-MM-dd").parse(startDay);
+				return startDate.getTime()/1000;
+			} catch (ParseException e) {
+				e.printStackTrace();
+				return 0;
+			}
         }
     }
 
     public long getUnixEndTime() {
         if (Strings.isNullOrEmpty(rangeTime)) {
-            return 0;
+            return Long.MAX_VALUE;
         } else {
             final String[] timeSplit = rangeTime.split(RANGE_TIME_DASH);
-            final LocalDate endTime = DateTimeUtil.str2Date(timeSplit[1]);
-            return (DateTimeUtil.timeMillsOfEndDate(endTime) / 1000) + 86399;
+            String endDay = timeSplit[1];
+			try {
+				Date endDate = new SimpleDateFormat("yyyy-MM-dd").parse(endDay);
+				return endDate.getTime()/1000 + 86400;
+			} catch (ParseException e) {
+				e.printStackTrace();
+				return Long.MAX_VALUE;
+			}
         }
     }
 

bpm-core/src/main/java/com/srm/bpm/logic/query/list/TodoBillQuery.java

@@ -22,6 +22,11 @@ public class TodoBillQuery extends DraftBillQuery {
      * 发起人
      */
     private long sender;
+    
+    /**
+     * 发起人姓名
+     */
+    private String senderName;
 
 
     /**

bpm-core/src/main/resources/mapper/bpm/infra/ToaBillDao.xml

@@ -61,6 +61,7 @@
         LEFT JOIN toa_form tf ON tf.process_id=tp.id AND tf.is_deleted=0
         LEFT JOIN form_setting fs ON fs.form_id=tf.id AND fs.is_deleted=0
         LEFT JOIN process_node_extend pne ON pne.node_id = approver.task_node_key AND pne.is_deleted=0
+        LEFT JOIN sp_user su ON tb.sender = su.id
         WHERE tb.is_deleted = 0 AND tb.status != 0
         <if test="query != null">
             <if test="query.rangeTime != null and  query.rangeTime != ''">
@@ -72,6 +73,9 @@
             <if test="query.sender > 0 ">
                 AND tb.sender = #{query.sender}
             </if>
+            <if test="query.senderName != null and query.senderName != ''">
+                AND su.username like CONCAT('%',#{query.senderName},'%')
+            </if>
             <if test="query.code != null and query.code != ''">
                 AND tb.code LIKE #{query.codeLike}
             </if>
@@ -97,6 +101,7 @@
         brr.is_deleted = 0
         LEFT JOIN toa_form tf ON tf.process_id=tp.id AND tf.is_deleted=0
         LEFT JOIN form_setting fs ON fs.form_id=tf.id AND fs.is_deleted=0
+        LEFT JOIN sp_user su ON tb.sender = su.id
         WHERE tb.is_deleted = 0 AND tb.status in
         <foreach collection="statusList" item="status" separator="," open="(" close=")">
             #{status}
@@ -111,6 +116,9 @@
             <if test="query.sender > 0 ">
                 AND tb.sender = #{query.sender}
             </if>
+            <if test="query.senderName != null and query.senderName != ''">
+                AND su.username like CONCAT('%',#{query.senderName},'%')
+            </if>
             <if test="query.code != null and query.code != ''">
                 AND tb.code like #{query.codeLike}
             </if>