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

src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java

@@ -58,8 +58,11 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value = "电话号码 ", example = "18712345678")
 	private String phone;
 
-	@ApiModelProperty(value = "所在地区", example = "广东省广州市白云区")
+	@ApiModelProperty(value = "所在地区id", example = "广东省广州市白云区")
 	private String area;
+	
+	@ApiModelProperty(value = "所在地区中文", example = "广东省广州市白云区")
+	private String areaName;
 
 	@ApiModelProperty(value = "办公地址 ", example = "广从一路5号柏曼酒店3楼")
 	private String workAddress;

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -121,8 +121,8 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="微信 ",example="微信")
     private String wechat;
     
-	@ApiModelProperty(value="个人邮箱 ",example="个人邮箱")
-    private String email;
+//	@ApiModelProperty(value="个人邮箱 ",example="个人邮箱")
+//    private String email;
     
 	@ApiModelProperty(value="血型 ",example="血型")
     private String bloodType;

src/main/java/cn/timer/api/controller/LoginController.java

@@ -495,6 +495,7 @@ public class LoginController {
 			String username = entRegisterDto.getUsername();
 			String name = entRegisterDto.getName();
 			String pw = entRegisterDto.getPw();
+			String email = entRegisterDto.getEmail();
 
 			if ((phone == null || StrUtil.hasBlank(phone)) || (username == null || StrUtil.hasBlank(username))
 					|| (name == null || StrUtil.hasBlank(name)) || (pw == null || StrUtil.hasBlank(pw))) {
@@ -525,9 +526,8 @@ public class LoginController {
 			}
 
 			if (login == null) {
-				System.err.println("kanxia");
 				// 员工信息
-				QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(phone).pw(Md5.md5(pw))
+				QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(phone).pw(Md5.md5(pw)).email(email)
 						.sts(CommonEnum.U_STS_ON.getType()).orgId(qyId).regTime(DateUtil.date()).build();
 				boolean b2 = qyzxEmpLogin.insert();
 				if (!b2) {
@@ -536,9 +536,9 @@ public class LoginController {
 				}
 				login = qyzxEmpLogin;
 			}
-			// 1-是主账号管理员
-			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date()).isManager(1)
-					.name(username).phone(phone).jobType(YgJobType.QUANZHI.getType())
+			// 员工信息
+			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date())
+					.name(username).phone(phone).workEmail(email).jobType(YgJobType.QUANZHI.getType())
 					.jobStatus(YgEnumInterface.jobStatus.ZHENSHI.getType()).build().insert();
 			if (!b4) {
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -581,6 +581,7 @@ public class LoginController {
 				System.out.println("重复初始化数据！");
 			}
 
+			// 绩效设置初始化
 			JxglBasicSetting bS = jxglService.selectAT(qyId);
 			if (bS == null) {
 				boolean res = jxglService.initJxglBasicSetting(qyId);

src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java

@@ -40,6 +40,7 @@ public class JxglServiceImpl implements JxglService {
 		
 		res = !performanceRating.insert() && res ? false : res;
 		
+		performanceRating.setId(null);
 		performanceRating.setBasicSettingId(bC.getId());
 		performanceRating.setName("B");
 		performanceRating.setSectionMinScore(60);
@@ -47,6 +48,7 @@ public class JxglServiceImpl implements JxglService {
 		performanceRating.setRanks(0);
 		res = !performanceRating.insert() && res ? false : res;
 		
+		performanceRating.setId(null);
 		performanceRating.setBasicSettingId(bC.getId());
 		performanceRating.setName("A");
 		performanceRating.setSectionMinScore(80);

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
@@ -34,6 +35,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.timer.api.aspect.lang.annotation.Log;
 import cn.timer.api.aspect.lang.enums.BusinessType;
+import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.spmk.SpmkApprovalG;
 import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
 import cn.timer.api.bean.spmk.SpmkApprovalTemplateG;
@@ -52,6 +54,7 @@ import cn.timer.api.config.enuminterface.SpmkEnumInterface;
 import cn.timer.api.config.enuminterface.SpmkEnumInterface.ApproveSummarySts;
 import cn.timer.api.config.enuminterface.SpmkEnumInterface.ExecutorSts;
 import cn.timer.api.config.enums.CommonEnum;
+import cn.timer.api.config.enums.SysRoleType;
 import cn.timer.api.config.exception.CustomException;
 import cn.timer.api.config.validation.Insert;
 import cn.timer.api.config.validation.Ranks;
@@ -60,6 +63,7 @@ import cn.timer.api.config.validation.ValidList;
 import cn.timer.api.controller.spmk.service.SpmkService;
 import cn.timer.api.controller.yggl.service.YgglService;
 import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
+import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
 import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
 import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper;
 import cn.timer.api.dao.spmk.SpmkApprovalTemplateMapper;
@@ -103,6 +107,8 @@ public class SpmkController {
 	private ZzglBmgwMService zzglBmgwMService;
 	
 	@Autowired
+	private QyzxEmpEntAssoMapper qyzxEmpEntAssoMapper;
+	@Autowired
     private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper;
 	@Autowired
     private SpmkApprovalTemplateMapper spmkApprovalTemplateMapper;
@@ -691,7 +697,17 @@ public class SpmkController {
 				.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
 				.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
 				.eq(SpmkExecutor::getSts, SpmkEnumInterface.ExecutorSts.IN_EXECUTION.ordinal())) == 0) {
-			return ResultUtil.error("非当前审批人,无法审批!");
+			
+			Integer adminNum = new LambdaQueryChainWrapper<QyzxEmpEntAsso>(qyzxEmpEntAssoMapper)
+					.eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum())
+					.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
+					.in(QyzxEmpEntAsso::getUserType, SysRoleType.U_TYPE_ADMIN,SysRoleType.U_TYPE_C_ADMIN)
+					.count();
+			
+			if (adminNum <= 0) {
+				return ResultUtil.error("非当前审批人 或 管理员,无法操作!");
+			}
+			
 		}
 		
 		if (aSummary.getSts() == 0) {

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

@@ -1309,8 +1309,7 @@ public class YgglController {
 
 		LambdaQueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<QyzxEmpEntAsso>().lambda()
 				.eq(QyzxEmpEntAsso::getEmpNum, empNum)
-				.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
-				;
+				.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode());
 
 		// 确认离职 删除员工关联表
 		qyzxEmpEntAssoMapper.delete(queryWrapper);
@@ -1322,7 +1321,8 @@ public class YgglController {
 				.eq(ZzglBmgwM::getLeader, empNum));
 
 		// 更新当前企业
-		List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(queryWrapper);
+		List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(new QueryWrapper<QyzxEmpEntAsso>().lambda()
+				.eq(QyzxEmpEntAsso::getEmpNum, empNum));
 		if (listEEA != null && listEEA.size() > 0) {
 			QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById();
 		}

src/main/java/cn/timer/api/dto/qyzx/EntRegisterDto.java

@@ -21,29 +21,32 @@ public class EntRegisterDto implements Serializable {
 
 	@ApiModelProperty(value = "密码", example = "123456")
 	private String pw;
-	
+
 	@ApiModelProperty(value = "用户名", example = "用户名")
 	private String username;
 
 	@ApiModelProperty(value = "企业名称 ", example = "企业名称")
 	private String name;
-	
+
 	@ApiModelProperty(value = "短信时间 ", example = "20191207")
 	private String sendDate;
-	
+
 	@ApiModelProperty(value = "原密码", example = "666666")
 	private String oldPwd;
-	
+
 	@ApiModelProperty(value = "验证码 ", example = "666666")
 	private String code;
-	
+
+	@ApiModelProperty(value = "邮箱", example = "youxiang@qq.com")
+	private String email;
+
 	@ApiModelProperty(value = "1.验证码 2.消息推送 3通知提醒 ", example = "1")
 	private Integer messageType;
 
 	@ApiModelProperty(value = "短信模板：1.身份验证验证码 2.登录确认验证码  3.登录异常验证码  4.用户注册验证码 5.修改密码验证码  6.信息变更验证码 ", example = "1")
 	private Integer tc;
-	
+
 	@ApiModelProperty(value = "1.原密码修改 2.验证码修改 ", example = "1")
 	private Integer pwUpdateType;
-	
+
 }

src/main/java/cn/timer/api/utils/DateUtil.java

@@ -99,6 +99,35 @@ public class DateUtil {
 
 		return 0;
 	}
+	
+	/**
+	 * 将String时间转换为时间戳
+	 * 
+	 * @param time
+	 * @return
+	 * @throws ParseException
+	 */
+	public static Date getFormatDate(String time) throws ParseException {
+		
+		if (StrUtil.isNotBlank(time)) {
+			
+			switch (time.length()) {
+			case 10:
+				return getStringDate(time, "yyyy-MM-dd");
+			case 16:
+				return getStringDate(time, "yyyy-MM-dd HH:mm");
+			case 19:
+				return getStringDate(time, "yyyy-MM-dd HH:mm:ss");
+			default:
+				break;
+			}
+			
+			return null;
+			
+		}
+		
+		return null;
+	}
 
 	/**
 	 * 将String时间转换为时间戳
@@ -107,6 +136,19 @@ public class DateUtil {
 	 * @return
 	 * @throws ParseException
 	 */
+	public static Date getStringDate(String time, String format)
+			throws ParseException {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+		return simpleDateFormat.parse(time);
+	}
+	
+	/**
+	 * 将String时间转换为 Date
+	 * 
+	 * @param time
+	 * @return
+	 * @throws ParseException
+	 */
 	public static long getStringTime(String time, String format)
 			throws ParseException {
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);

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

@@ -50,8 +50,8 @@ public class GoOutBusiness extends SpmkAssoBusiness {
 				.orgcode(orgCode)
 				.evectionid(Convert.toInt(approveId))
 				.evectiontype(2)
-				.starttime(DateUtil.getStringTime(startTime, "yyyy-MM-dd HH:mm:ss"))
-				.endtime(DateUtil.getStringTime(endTime, "yyyy-MM-dd HH:mm:ss"))
+				.starttime(DateUtil.getFormat(startTime))
+				.endtime(DateUtil.getFormat(endTime))
 				.duration(Convert.toDouble(longTime))
 				.build();
 				

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

@@ -15,6 +15,7 @@ import cn.timer.api.controller.yggl.service.YgglService;
 import cn.timer.api.dto.spmk.FromData;
 import cn.timer.api.dto.yggl.YgzzDto;
 import cn.timer.api.utils.DateFormatUtils;
+import cn.timer.api.utils.DateUtil;
 import lombok.Builder;
 
 /**
@@ -60,8 +61,8 @@ public class RegularizationBusiness extends SpmkAssoBusiness {
 		YgzzDto ygzzDto = YgzzDto.builder()
 				.empNum(id)
 				.orgCode(orgCode)
-				.zzTime(DateFormatUtils.getDateByString(confirmationTime))
-				.sjzzTime(DateFormatUtils.getDateByString(newConfirmationTime))
+				.zzTime(DateUtil.getFormatDate(confirmationTime))
+				.sjzzTime(DateUtil.getFormatDate(newConfirmationTime))
 				.zzRemark(Remarks)
 				.build();
 		System.out.println("转正:"+ygzzDto);

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

@@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.timer.api.controller.yggl.service.YgglService;
 import cn.timer.api.dto.spmk.FromData;
 import cn.timer.api.dto.yggl.LzygQueryDto;
 import cn.timer.api.utils.DateFormatUtils;
+import cn.timer.api.utils.DateUtil;
 import lombok.Builder;
 
 /**
@@ -46,7 +46,7 @@ public class ResignationBusiness extends SpmkAssoBusiness {
 		LzygQueryDto dtO = LzygQueryDto.builder()
 					.orgCode(orgCode)
 					.empNum(id)
-					.lzTime(DateFormatUtils.getDateByString(terminationDate))
+					.lzTime(DateUtil.getFormatDate(terminationDate))
 					.lzyy(ReasonForResignation)
 					.lzbz(Remarks)
 					.build();