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

src/main/java/cn/timer/api/bean/crm/CrmSeaRule.java

@@ -53,17 +53,17 @@ public class CrmSeaRule extends Model<CrmSeaRule> {
 	private Integer gid;
 	private Integer gid;
 
 
 	@ApiModelProperty(value = "添加客户之后(one)天没有跟进 （以跟进记录为准）")
 	@ApiModelProperty(value = "添加客户之后(one)天没有跟进 （以跟进记录为准）")
-	private Integer one;
+	private int one;
 
 
 	@ApiModelProperty(value = "距上次跟进(two)天没有再次跟进 （以跟进记录为准）")
 	@ApiModelProperty(value = "距上次跟进(two)天没有再次跟进 （以跟进记录为准）")
-	private Integer two;
+	private int two;
 
 
 	@ApiModelProperty(value = "添加客户之后(three)天没有成交 （天数必须大于规则1）")
 	@ApiModelProperty(value = "添加客户之后(three)天没有成交 （天数必须大于规则1）")
-	private Integer three;
+	private int three;
 
 
 	@ApiModelProperty(value = "系统提前(four)天自动提醒业务员客户将被回收")
 	@ApiModelProperty(value = "系统提前(four)天自动提醒业务员客户将被回收")
-	private Integer four;
+	private int four;
 
 
 //	@ApiModelProperty(value = "我的客户数量最多(five)人（合作中的不算）")
 //	@ApiModelProperty(value = "我的客户数量最多(five)人（合作中的不算）")
-//	private Integer five;
+//	private int five;
 }
 }

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

@@ -65,10 +65,12 @@ public class CrmRuleController {
 				Date now = new Date();
 				Date now = new Date();
 				// 客户创建时间+ x天 = 过期释放时间
 				// 客户创建时间+ x天 = 过期释放时间
 				DateTime overDate1 = DateUtil.offsetDay(createTime, one);
 				DateTime overDate1 = DateUtil.offsetDay(createTime, one);
-				Long compare2 = null;
+				long compare2 = 0;
 				if (lastFollowTime != null) {
 				if (lastFollowTime != null) {
 					DateTime overDate2 = DateUtil.offsetDay(lastFollowTime, two);
 					DateTime overDate2 = DateUtil.offsetDay(lastFollowTime, two);
 					compare2 = DateUtil.between(overDate2, now, DateUnit.DAY, false);
 					compare2 = DateUtil.between(overDate2, now, DateUnit.DAY, false);
+					if (compare2 == -four)
+						remind(belongUserName, clientName, four);
 				}
 				}
 				DateTime overDate3 = DateUtil.offsetDay(createTime, three);
 				DateTime overDate3 = DateUtil.offsetDay(createTime, three);
 				// 时间比较
 				// 时间比较
@@ -80,7 +82,7 @@ public class CrmRuleController {
 						|| (compare3 >= 0 && status != 3 && status != 4))
 						|| (compare3 >= 0 && status != 3 && status != 4))
 					release(crmClientData);
 					release(crmClientData);
 				// 判断4
 				// 判断4
-				if (compare1 == -four || compare2 == -four || compare3 == -four) // TODO
+				if (compare1 == -four || compare3 == -four)
 					remind(belongUserName, clientName, four);
 					remind(belongUserName, clientName, four);
 			}
 			}
 		}
 		}

src/main/java/cn/timer/api/controller/dzht/DzhtController2.java

@@ -201,9 +201,14 @@ public class DzhtController2 {
 	@PostMapping("/orgTemplate")
 	@PostMapping("/orgTemplate")
 	@ApiOperation(value = "创建机构模板印章", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperation(value = "创建机构模板印章", httpMethod = "POST", notes = "接口发布说明")
 	public Result<Object> orgTemplate(@CurrentUser UserBean userBean, @RequestBody DzhtAssoQyyz qyyz) {
 	public Result<Object> orgTemplate(@CurrentUser UserBean userBean, @RequestBody DzhtAssoQyyz qyyz) {
-		String orgId = DzhtAssoQyzc.builder().build().selectOne(
-//				new QueryWrapper<DzhtAssoQyzc>().eq("third_party_user_id", qyyz.getThirdPartyUserId()).select("org_id"))
-				new QueryWrapper<DzhtAssoQyzc>().eq("org_code", userBean.getOrgCode()).select("org_id")).getOrgId();// 查询orgId
+
+		DzhtAssoQyzc yz = DzhtAssoQyzc.builder().build()
+				.selectOne(new QueryWrapper<DzhtAssoQyzc>().eq("org_code", userBean.getOrgCode()).select("org_id"));
+		if (yz == null) {
+			return ResultUtil.error("请先在签约主体中进行企业认证");
+		}
+		String orgId = yz.getOrgId();// 查询orgId
+
 		// String orgId = "dfd84b9a58d345ea90f6711bad853435";// 测试公司账户
 		// String orgId = "dfd84b9a58d345ea90f6711bad853435";// 测试公司账户
 		// 印章参数
 		// 印章参数
 		String alias = qyyz.getAlias();
 		String alias = qyyz.getAlias();

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -358,7 +358,7 @@ public class CmsController {
 		// 查询条件
 		// 查询条件
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("organization_id", userBean.getOrgCode())
 		queryWrapper.eq("organization_id", userBean.getOrgCode())
-				.select("id", "auditopinion", "modularid", "status", "title", "releasetime", "addeddate", "author",
+				.select("id","publisher_name", "auditopinion", "modularid", "status", "title", "releasetime", "addeddate", "author",
 						"summary", "releasetype", "fmtpath")
 						"summary", "releasetype", "fmtpath")
 				.ne("status", 1).eq(t != null && t > -1, "modularid", t)
 				.ne("status", 1).eq(t != null && t > -1, "modularid", t)
 				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",
 				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",

src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java

@@ -9,6 +9,7 @@ package cn.timer.api.controller.qyzx;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 
 import cn.timer.api.bean.qyzx.auth.QyzxAuthAccount;
 import cn.timer.api.bean.qyzx.auth.QyzxAuthAccount;
@@ -170,4 +172,20 @@ public class QyzxAuthController {
 
 
 	}
 	}
 
 
+	@GetMapping(value = "/getYgAuth")
+	@ApiOperation(value = "获取全部权限信息", httpMethod = "GET", notes = "接口发布说明")
+	public Result<List<YgglMainEmp>> getYgAuth(@CurrentUser UserBean userBean) {
+		YgglMainEmp main = YgglMainEmp.builder().build()
+				.selectOne(new LambdaQueryWrapper<YgglMainEmp>().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
+						.eq(YgglMainEmp::getIsManager, 1).select(YgglMainEmp::getName, YgglMainEmp::getPhone,
+								YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
+
+		List<YgglMainEmp> child = YgglMainEmp.builder().build()
+				.selectList(new LambdaQueryWrapper<YgglMainEmp>().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
+						.eq(YgglMainEmp::getIsManager, 2).select(YgglMainEmp::getName, YgglMainEmp::getPhone,
+								YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
+		child.add(main);
+		return ResultUtil.data(child, "查询成功");
+	}
+
 }
 }

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -305,7 +305,7 @@ public class YgglController {
 
 
 		if (ObjectUtil.isAllNotEmpty(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())
 		if (ObjectUtil.isAllNotEmpty(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())
 				&& !DateFormatUtils.getCompareDate(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())) {
 				&& !DateFormatUtils.getCompareDate(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())) {
-			ResultUtil.error("入职日期 不可以大于 转正日期");
+			return ResultUtil.error("入职日期 不可以大于 转正日期");
 		}
 		}
 
 
 		if (ygglMainEmp.getEmpNum() != null) {
 		if (ygglMainEmp.getEmpNum() != null) {