Просмотр исходного кода

新增自动移交和主动移交日志

anderx лет назад: 4
Родитель
Сommit
3bdfff1cf3

+ 1 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -183,5 +183,5 @@ public class AFTConstants {
 	
 	public static final String DEFAULT_RESULT="签单-自动触发";
 
-    public static final long DUN_START_LIMIT_MS						= 24*3600*1000*900L;
+    public static final long DUN_START_LIMIT_MS						= 24*3600*1000*30L;
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderLegalAffairsMapper.java

@@ -19,4 +19,6 @@ public interface TOrderLegalAffairsMapper {
     int updateByPrimaryKey(TOrderLegalAffairs record);
 
     List<OutLegalAffairsLogBo> lagalAffairsLogList(String orderNo);
+
+    void insertBatch(List<String> list);
 }

+ 11 - 1
src/main/java/com/goafanti/common/mapper/TOrderLegalAffairsMapper.xml

@@ -90,7 +90,8 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderLegalAffairs">
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderLegalAffairs">
     update t_order_legal_affairs
     <set>
       <if test="orderNo != null">
@@ -139,4 +140,13 @@
     from t_order_legal_affairs a left join admin b on a.aid=b.id left join t_order_mid c on a.order_no =c.order_no
     where a.order_no = #{orderNo}
   </select>
+
+  <insert id="insertBatch">
+    INSERT INTO t_order_legal_affairs
+      (order_no, `type`,  create_time, aid)
+    values
+    <foreach item="item" index="index" collection="list" separator=",">
+      (#{item},3,now(),'1')
+    </foreach>
+  </insert>
 </mapper>

+ 4 - 2
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -89,12 +89,13 @@ public class OrderDunTask {
 	 */
 	@RequestMapping(value = "/open/pushLegalAffairs", method = RequestMethod.GET)
 	public void pushLegalAffairs() {
-		List<OutOrderLegalAffairsListBo>  list=legalAffairsService.getLegalAffairsOrder(new InputOrderListBo());
+		InputOrderListBo in = new InputOrderListBo();
+		List<OutOrderLegalAffairsListBo>  list=legalAffairsService.getLegalAffairsOrder(in);
 		ArrayList<String> addList = new ArrayList<>();
 		Date now=new Date();
 		for (OutOrderLegalAffairsListBo out : list) {
 			Long l=out.getDunStartTime().getTime()+AFTConstants.DUN_START_LIMIT_MS;
-			if (now.getTime()<l){
+			if (l<now.getTime()){
 				addList.add(out.getOrderNo());
 			}
 		}
@@ -104,6 +105,7 @@ public class OrderDunTask {
 			addList2.add(addList.get(i));
 			if (50 == addList2.size() || i == addList.size() - 1){
 				tOrderMidMapper.updateByList(addList2);
+				legalAffairsService.addLagalAffairsLogList(addList2);
 			}
 
 		}

+ 2 - 2
src/main/java/com/goafanti/order/controller/LegalAffairsApiController.java

@@ -32,7 +32,7 @@ public class LegalAffairsApiController extends CertifyApiController {
      * @return 成功 1
      */
     @RequestMapping(value = "/transfer")
-    public Result transferLagalAffairs(String orderNo){
+    public Result transferLagalAffairs(String orderNo,String remarks){
         Result res =new Result();
         if (orderNo==null){
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
@@ -42,7 +42,7 @@ public class LegalAffairsApiController extends CertifyApiController {
             res.getError().add(buildError("高新项目未完成,请先完成项目!","高新项目未完成,请先完成项目!"));
             return res;
         }
-        res.data(legalAffairsService.pushTransferLagalAffairs(orderNo));
+        res.data(legalAffairsService.pushTransferLagalAffairs(orderNo,remarks));
         return res;
 
     }

+ 7 - 1
src/main/java/com/goafanti/order/service/LegalAffairsService.java

@@ -8,7 +8,7 @@ import java.util.List;
 public interface LegalAffairsService {
 
 
-    int pushTransferLagalAffairs(String orderNo);
+    int pushTransferLagalAffairs(String orderNo,String remarks);
 
     Object orderListPage(InputOrderListBo in);
 
@@ -27,4 +27,10 @@ public interface LegalAffairsService {
     List<OutLegalAffairsLogBo> lagalAffairsLogList(String orderNo);
 
     Result orderListExprot(InputOrderListBo in);
+
+    /**
+     * 批量新增法务日志
+     * @param addList2
+     */
+    void addLagalAffairsLogList(List<String> addList2);
 }

+ 14 - 6
src/main/java/com/goafanti/order/service/impl/LegalAffairsServiceImpl.java

@@ -41,12 +41,17 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
 
 
     @Override
-    public  int pushTransferLagalAffairs(String orderNo){
+    public  int pushTransferLagalAffairs(String orderNo,String remarks){
         TOrderMid tm = new TOrderMid();
         tm.setOrderNo(orderNo);
         tm.setLegalAffairs(1);
         tm.setLegalAffairsType(0);
         tm.setLegalAffairsStatus(0);
+        InputOrderLegalAffairs in=new InputOrderLegalAffairs();
+        in.setOrderNo(orderNo);
+        in.setRemarks(remarks);
+        in.setType(4);
+        addLagalAffairsLog(in);
         return tOrderMidMapper.updateByOrderNo(tm);
     }
 
@@ -111,11 +116,9 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
     @Override
     public List<OutOrderLegalAffairsListBo> getLegalAffairsOrder(InputOrderListBo in) {
         HashMap<String, Object> params = new HashMap<>();
-        addParams(in, params);
+        params.put("type",0);
+        params.put("legalAffairs",0);
         List<OutOrderLegalAffairsListBo> list =(List<OutOrderLegalAffairsListBo>) findList("legalAffairsOrderList",params,1,999999);
-        if(in.getType()==0){
-            sumDaysRemaining(list);
-        }
         return list;
     }
 
@@ -157,7 +160,7 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
         la.setStatus(in.getStatus());
         la.setAttachmentUrl(in.getAttachmentUrl());
         la.setAid(TokenManager.getAdminId());
-        la.setOperationTime(DateUtils.StringToDate(in.getDate(),AFTConstants.YYYYMMDD));
+        if(in.getDate()!=null)la.setOperationTime(DateUtils.StringToDate(in.getDate(),AFTConstants.YYYYMMDD));
         TOrderMid tm = new TOrderMid();
         tm.setOrderNo(in.getOrderNo());
         tm.setLegalAffairsType(in.getType());
@@ -215,4 +218,9 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
         }
         return newExcelUtil.exportExcel(list,tile,uploadPath,sb.substring(0,sb.length()-1));
     }
+
+    @Override
+    public void addLagalAffairsLogList(List<String> addList2) {
+        tOrderLegalAffairsMapper.insertBatch(addList2);
+    }
 }

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,11 +1,11 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20