Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

src/main/java/cn/timer/api/controller/crm/CrmRuleController.java

@@ -36,7 +36,7 @@ import cn.timer.api.bean.crm.CrmSeaRule;
 @Component
 public class CrmRuleController {
 
-	@Scheduled(cron = "0 0 0/1 * * ? ") // 每小时扫描
+	@Scheduled(cron = "0 0 10 * * ? ") // 每小时扫描
 	@Transactional
 	public void getRules() {
 		// 全部业务组规则

src/main/java/cn/timer/api/dao/crm/CrmClientDataMapper.java

@@ -7,13 +7,17 @@
 */
 package cn.timer.api.dao.crm;
 
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RequestParam;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import cn.timer.api.bean.crm.CrmClientData;
+import cn.timer.api.dto.crm.CrmCartogramDto;
 
 /**
- * Title: CrmClientDataMapper.java
- * Description:
+ * Title: CrmClientDataMapper.java Description:
  * 
  * @author dsc
  * @date 2020年6月5日
@@ -21,4 +25,9 @@ import cn.timer.api.bean.crm.CrmClientData;
  */
 public interface CrmClientDataMapper extends BaseMapper<CrmClientData> {
 
+	List<CrmCartogramDto> crmCartogram(@RequestParam("orgCode") Integer orgCode,
+			@RequestParam(name = "belongUser", required = false) Integer belongUser,
+			@RequestParam(name = "belongGroup", required = false) Integer belongGroup,
+			@RequestParam(name = "startCreateTime", required = false) String startCreateTime,
+			@RequestParam(name = "endCreateTime", required = false) String endCreateTime);
 }

src/main/java/cn/timer/api/dto/crm/CrmCartogramDto.java

+/**  
+* Title: CrmCartogramDto.java 
+* Description: 
+* @author dsc  
+* @date 2020年6月22日  
+* @version 1.0  
+*/
+package cn.timer.api.dto.crm;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Title: CrmCartogramDto.java
+ * 
+ * @Description:
+ * @author dsc
+ * @date 2020年6月22日
+ * @version 1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CrmCartogramDto implements Serializable {
+	private static final long serialVersionUID = -4445892627839823485L;
+	private Integer provinceId;
+	private String provinceName;
+	private Integer num;
+}

src/main/java/cn/timer/api/dto/crm/CrmClientDataImportVo.java

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
 /**
  * Title: CrmClientDataImportVo.java
  * 
- * @Description:
+ * @Description: 客户导入
  * @author dsc
  * @date 2020年6月12日
  * @version 1.0

src/main/java/cn/timer/api/utils/router/RouterUtils.java

@@ -550,10 +550,14 @@ public class RouterUtils {
 						//在 原审批人 列表中 插入 一个被转派人(审批人)
 						}else if (sts == ExecutorSts.REDEPLOY.ordinal()) {
 							List<User> users1 = CollectionUtil.sub(listUser, 0, i_user+1);
+							redeployUser.setExecute(UNEXECUTED);
 							users1.add(redeployUser);
 							List<User> users2 = CollectionUtil.sub(listUser, i_user+1, listUser.size());
+							System.out.println(users1);
+							System.out.println(users2);
 							listUser = ListUtils.union(users1, users2);
 							n_user = listUser.size();
+							System.out.println(listUser);
 						}
 					}else if (UNEXECUTED.equals(listUser.get(i_user).getExecute())) {
 						SpmkExecutor.builder()

src/main/java/cn/timer/api/utils/router/business/ReissueACardBusiness.java

@@ -39,7 +39,7 @@ public class ReissueACardBusiness extends SpmkAssoBusiness {
 		String PatchCardTime = ObjectUtil.isNull(jsonObj.get("__PatchCardTime",FromData.class)) ? null : jsonObj.get("__PatchCardTime",FromData.class).getValue();
 		// 缺卡原因
 		String cardShortage = ObjectUtil.isNull(jsonObj.get("cardShortage",FromData.class)) ? null : jsonObj.get("cardShortage",FromData.class).getValue();
-		
+
 		// 缺卡时段-上班、下班-前端未改
 		String cardSupplementType = ObjectUtil.isNull(jsonObj.get("__CardSupplementType",FromData.class)) ? null : jsonObj.get("__CardSupplementType",FromData.class).getValue();
 		

src/main/resources/mapping/crm/CrmClientDataMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.timer.api.dao.crm.CrmClientDataMapper">
+
+	<select id="crmCartogram"
+		resultType="cn.timer.api.dto.crm.CrmCartogramDto">
+		SELECT
+			province_id,province as provinceName,count(province_id) num
+		FROM
+			crm_client_data
+		WHERE
+			org_code = #{orgCode}
+		<if test='null != belongUser and belongUser !=""'>AND
+			belong_user = #{belongUser}
+		</if>
+		<if test='null != belongGroup and belongGroup !=""'>AND
+			belong_group = #{belongGroup}
+		</if>
+		<if test='null != startCreateTime and startCreateTime !=""'>AND
+			 create_time <![CDATA[>=]]>  #{startCreateTime}
+		</if>
+		<if test='null != endCreateTime and endCreateTime !=""'>AND
+			 create_time <![CDATA[<=]]>  #{endCreateTime}
+		</if>
+		GROUP BY
+			province_id
+	</select>
+
+</mapper>
\ No newline at end of file