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

a94b1737 · tangzhaoqian · 98dd23a2 · 95558238 · a94b1737 · a94b1737
Commit a94b1737 authored Jun 19, 2020 by tangzhaoqian
16 changed files
--- a/src/main/java/cn/timer/api/controller/LoginController.java
+++ b/src/main/java/cn/timer/api/controller/LoginController.java
@@ -32,6 +32,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.timer.api.aspect.lang.annotation.Log;
 import cn.timer.api.aspect.lang.enums.BusinessType;
+import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
@@ -48,6 +49,7 @@ import cn.timer.api.config.enuminterface.YgEnumInterface.YgJobType;
 import cn.timer.api.config.enums.CommonEnum;
 import cn.timer.api.config.enums.SysRoleType;
 import cn.timer.api.controller.spmk.service.SpmkServiceImpl;
+import cn.timer.api.dao.kqmk.KqglAssoLeaveRulesMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
@@ -458,6 +460,9 @@ public class LoginController {
 	@Autowired
 	SpmkServiceImpl SpmkService;
+	@Autowired
+	private KqglAssoLeaveRulesMapper kqglassoleaverulesmapper;
 	/**
 	 * 注册企业
 	 * 
@@ -542,6 +547,31 @@ public class LoginController {
 					.accountPhone(phone).empNum(login.getId()).orgCode(qyzxEntInfoM.getId()).build().insert(); // TODO
 																												// 主账号权限表
+			//*****************************考勤假期初始化
+			//获取模板数据
+			List<KqglAssoLeaveRules> ruless = new LambdaQueryChainWrapper<KqglAssoLeaveRules>(kqglassoleaverulesmapper).eq(KqglAssoLeaveRules::getOrgCode, 0).list();
+			//查询当前公司是否已初始化
+			KqglAssoLeaveRules rule = kqglassoleaverulesmapper.selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, qyzxEntInfoM.getId())
+					.eq(KqglAssoLeaveRules::getLeaveType, 1).last("LIMIT 1"));
+			if(rule == null) {
+				List<KqglAssoLeaveRules> rullist = new ArrayList<KqglAssoLeaveRules>();
+				for(KqglAssoLeaveRules rul : ruless){
+					KqglAssoLeaveRules vice = KqglAssoLeaveRules.builder().name(rul.getName()).company(rul.getCompany()).leaveType(rul.getLeaveType())
+							.apply(rul.getApply()).createTime(new Date().getTime()).createUserid(999).orgCode(qyzxEntInfoM.getId())
+							.isOpen(rul.getIsOpen()).leaveBalance(rul.getLeaveBalance()).rulesType(rul.getRulesType()).build();
+					rullist.add(vice);
+				}
+				if(rullist.size() > 0) {
+					kqglassoleaverulesmapper.insertleaverulesList(rullist);
+				}
+				System.out.println("操作成功!");
+			}else {
+				System.out.println("重复初始化数据！");
+			}
 			return ResultUtil.success("注册企业成功");
 		} catch (Exception e) {
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

--- a/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
+++ b/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
@@ -42,7 +42,6 @@ import cn.timer.api.bean.dzht.DzhtAssoQyyz;
 import cn.timer.api.bean.dzht.DzhtAssoQyzc;
 import cn.timer.api.bean.dzht.DzhtAssoSdgzq;
 import cn.timer.api.bean.dzht.DzhtAssoTpyz;
-import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.businessService.QyzxRemainingQuantity;
 import cn.timer.api.bean.qyzx.businessService.QyzxUseRecord;
 import cn.timer.api.bean.yggl.YgglMainEmp;
@@ -206,16 +205,16 @@ public class DzhtController2 {
 	@GetMapping("/getOrganizations")
 	@ApiOperation(value = "查询企业信息s", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getOrganizations(@CurrentUser UserBean userBean) {
-		List<QyzxEmpEntAsso> list = QyzxEmpEntAsso.builder().build().selectList(
+//		List<QyzxEmpEntAsso> list = QyzxEmpEntAsso.builder().build().selectList(
-				new QueryWrapper<QyzxEmpEntAsso>().lambda().eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum()));
+//				new QueryWrapper<QyzxEmpEntAsso>().lambda().eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum()));
-		List<Integer> orgCodeList = Lists.transform(list, newList -> newList.getOrgCode());
+//		List<Integer> orgCodeList = Lists.transform(list, newList -> newList.getOrgCode());
 		List<String> orgIds = new ArrayList<String>();
-		for (Integer orgCode : orgCodeList) {
+//		for (Integer orgCode : orgCodeList) {
 			DzhtAssoQyzc qyzc = DzhtAssoQyzc.builder().build().selectOne(new QueryWrapper<DzhtAssoQyzc>().lambda()
-					.eq(DzhtAssoQyzc::getOrgCode, orgCode).select(DzhtAssoQyzc::getOrgId));
+					.eq(DzhtAssoQyzc::getOrgCode, userBean.getOrgCode()).select(DzhtAssoQyzc::getOrgId));
 			if (qyzc != null)
 				orgIds.add(qyzc.getOrgId());
-		}
+//		}
 		JSONObject j = null;
 		List<JSONObject> result = new ArrayList<JSONObject>();
 		try {

--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
--- a/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
@@ -343,6 +343,7 @@ public class TimeCardController {
 		StartTimeRestDto[] rest = overrules.getStarttime();
 		if(rest != null && rest.length>0){
 			for(int p=0;p<rest.length;p++){
+				if(rest[p].getStarttime() != null) {
 					KqglAssOvertimeVice.builder().build().delete(new QueryWrapper<KqglAssOvertimeVice>().lambda().eq(KqglAssOvertimeVice::getOvertimeRulesId, id));
 					KqglAssOvertimeVice vice = new KqglAssOvertimeVice();
 					vice.setOvertimeRulesId(id);
@@ -350,6 +351,10 @@ public class TimeCardController {
 					vice.setBreakEndTime(rest[p].getEndtime());
 					vice.setOverType(rest[p].getOvertype());
 					overtimes.add(vice);
+				}else {
+					break;
+				}
 			}
 		}
 		if(overtimes.size()>0){
@@ -481,7 +486,7 @@ public class TimeCardController {
 			}
 		}else {
 			for(YgglMainEmp ye:yggl) {
-				KqglAssoLeaveBalance.builder().leaveRulesId(id).userid(ye.getEmpNum()).modifyAction(1).balanceDays("-1-1")
+				KqglAssoLeaveBalance.builder().leaveRulesId(id).userid(ye.getEmpNum()).modifyAction(1).balanceDays("-1")
 						.reason("不限制余额").modifyUserid(userBean.getEmpNum()).modifyTimer(new Date().getTime()).orgCode(userBean.getOrgCode()).isAutomatic(1).modifyNumber(1).build().insert();//员工假期余额
 			}
 		} 
@@ -852,6 +857,17 @@ public class TimeCardController {
 	}
 	/**
+	 * 根据考勤余额id获取信息
+	 */
+	@GetMapping(value="/hqleavebalance/{id}")
+	@ApiOperation(value = "获取班次信息-根据班次id", httpMethod = "GET", notes = "接口发布说明")
+	public Result<Object> hqleavebalance(@PathVariable("id") Integer id,@CurrentUser UserBean userBean) {
+		EmployeeLeaveBalanceDto leanemp = kqglassoleavebalancemapper.selectleavebalanceList(id,userBean.getEmpNum());
+		return ResultUtil.data(leanemp, "操作成功!");
+	}
+	/**
 	 * 根据 组织机构代码获取员工假期余额表头
 	 */
 	@GetMapping(value="/balance_header")
@@ -871,15 +887,38 @@ public class TimeCardController {
 	@ApiOperation(value = "30: 查询列表-假期规则", httpMethod = "GET", notes = " 查询列表-假期规则")
 	@ApiOperationSupport(order = 30)
 	public Result<Object> selectListLeaveRules(@CurrentUser UserBean userBean) {
-		List<KqglAssoLeaveRules> balheas = new LambdaQueryChainWrapper<KqglAssoLeaveRules>(kqglassoleaverulesmapper).eq(KqglAssoLeaveRules :: getOrgCode,userBean.getOrgCode())
+//		List<KqglAssoLeaveRules> balheas = new LambdaQueryChainWrapper<KqglAssoLeaveRules>(kqglassoleaverulesmapper).eq(KqglAssoLeaveRules :: getOrgCode,userBean.getOrgCode())
-				.eq(KqglAssoLeaveRules :: getLeaveType, 2).or().eq(KqglAssoLeaveRules :: getIsOpen, 1).list();
+//				.eq(KqglAssoLeaveRules :: getLeaveType, 2).or().eq(KqglAssoLeaveRules :: getIsOpen, 1).list();
 		List<LeaveTypeDto> leas = new ArrayList<LeaveTypeDto>();
-		for(KqglAssoLeaveRules rul : balheas) {
+		KqglAssoYhkqz yhd = KqglAssoYhkqz.builder().build().selectOne(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, userBean.getEmpNum()).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode()));
+		if(yhd != null) {
+			//获取假期适用全公司的
+			List<KqglAssoLeaveRules> whole = kqglassoleaverulesmapper.selCompanywidedata(userBean.getOrgCode(), 2, 1);
+			for(KqglAssoLeaveRules rul : whole) {
 				LeaveTypeDto lea = LeaveTypeDto.builder().build();
 				lea.setId(rul.getId());
 				lea.setValue(rul.getName());
 				leas.add(lea);
 			}
+			List<KqglAssoLeaveRules> assholi = kqglassoleaverulesmapper.AssociatedHolidays(yhd.getKqzid());
+			for(KqglAssoLeaveRules rul1 : assholi) {
+				LeaveTypeDto lea = LeaveTypeDto.builder().build();
+				lea.setId(rul1.getId());
+				lea.setValue(rul1.getName());
+				leas.add(lea);
+			}
+		}
+//		List<KqglAssoLeaveRules> balheas = kqglassoleaverulesmapper.selHeaderdata(userBean.getOrgCode(), 2, 1);
+//		List<LeaveTypeDto> leas = new ArrayList<LeaveTypeDto>();
+//		for(KqglAssoLeaveRules rul : balheas) {
+//			LeaveTypeDto lea = LeaveTypeDto.builder().build();
+//			lea.setId(rul.getId());
+//			lea.setValue(rul.getName());
+//			leas.add(lea);
+//		}
 		return ResultUtil.data(leas, "操作成功!");
 	}

--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
@@ -105,7 +105,7 @@ public class AttendanceTaskTiming{
 	 */
 	 //3.添加定时任务 每天下午七点执行一次
-     @Scheduled(cron = "0 0 19 * * ?")
+//     @Scheduled(cron = "0 0 19 * * ?")
    //或直接指定时间间隔，例如：5秒
    //@Scheduled(fixedRate=5000)

--- a/src/main/java/cn/timer/api/controller/zcgl/ZcglController.java
+++ b/src/main/java/cn/timer/api/controller/zcgl/ZcglController.java
@@ -308,8 +308,10 @@ public class ZcglController {
 				zcglQueryDto.getTotalPage() == null ? 10 : zcglQueryDto.getTotalPage());
 		QueryWrapper<ZcglAdminZccrkgl> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status", 0).between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "grsj_time",
+		queryWrapper.eq("org_code", userBean.getOrgCode()).eq("status", 0)
-				!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00", !StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
+				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "grsj_time",
+						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
+						!StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
 				.and(!StrUtil.hasBlank(q),
 						wq -> wq.like("zcmc", q).or().like("zcggxh", q).or().like("zcgys", q).or().like("zcbh", q));
@@ -336,8 +338,10 @@ public class ZcglController {
 				zcglQueryDto.getTotalPage() == null ? 10 : zcglQueryDto.getTotalPage());
 		QueryWrapper<ZcglAdminZccrkgl> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status", 1).between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "grsj_time",
+		queryWrapper.eq("org_code", userBean.getOrgCode()).eq("status", 1)
-				!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00", !StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
+				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "grsj_time",
+						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
+						!StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
 				.and(!StrUtil.hasBlank(q),
 						wq -> wq.like("zcmc", q).or().like("zcggxh", q).or().like("zcgys", q).or().like("zcbh", q));

--- a/src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveBalanceMapper.java
+++ b/src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveBalanceMapper.java
@@ -26,4 +26,6 @@ public interface KqglAssoLeaveBalanceMapper extends BaseMapper<KqglAssoLeaveBala
 	AdditionalDto selectAdditional(int orgcode,int empnum);
 	List<AdditionalDto> selectAdditionalList(int orgcode);
+	EmployeeLeaveBalanceDto selectleavebalanceList(int leaverulesid,int userid);
 }
--- a/src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveRulesMapper.java
+++ b/src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveRulesMapper.java
@@ -19,4 +19,8 @@ public interface KqglAssoLeaveRulesMapper extends BaseMapper<KqglAssoLeaveRules>
 	int insertleaverulesList(List<KqglAssoLeaveRules> kqglassoleaverules);
 	List<KqglAssoLeaveRules> selHeaderdata(int orgcode,int leavetype,int isopen);
+	List<KqglAssoLeaveRules> selCompanywidedata(int orgcode,int leavetype,int isopen);
+	List<KqglAssoLeaveRules> AssociatedHolidays(int attgroupid);
 }
--- a/src/main/java/cn/timer/api/dto/kqmk/EmployeeLeaveBalanceDto.java
+++ b/src/main/java/cn/timer/api/dto/kqmk/EmployeeLeaveBalanceDto.java
@@ -26,6 +26,11 @@ public class EmployeeLeaveBalanceDto {
 	@ApiModelProperty(value = "入职日期 ", example = "字段说明")
 	private String rztime;
+	@ApiModelProperty(value = " ", example = "字段说明")
+	private String userid;
+	@ApiModelProperty(value = " ", example = "字段说明")
+	private String balancedays;
 	@ApiModelProperty(value = "表数据", example = "字段说明")
 	List<BalanceSheetDataDto> balanceTo;
 }
--- a/src/main/java/cn/timer/api/utils/aliyun/AliyunSMS.java
+++ b/src/main/java/cn/timer/api/utils/aliyun/AliyunSMS.java
@@ -109,7 +109,6 @@ public class AliyunSMS {
 		request.putQueryParameter("RegionId", REGION_ID);
 		request.putQueryParameter("PhoneNumbers", phone);
 		request.putQueryParameter("SignName", PROJECT_NAME);
 		switch (templateCode) {
 		case 1:
 			request.putQueryParameter(CODE_NAME, PinType.AUTHENTICATION.getCode());
@@ -145,8 +144,8 @@ public class AliyunSMS {
 		String a = null;
 		try {
 			response = client.getCommonResponse(request);
 			a = response.getData();
+//			System.err.println("response:"+a); // 短信服务响应内容
 		} catch (ServerException e) {
 			e.printStackTrace();
 		} catch (ClientException e) {

--- a/src/main/java/cn/timer/api/utils/router/business/EvectionBusiness.java
+++ b/src/main/java/cn/timer/api/utils/router/business/EvectionBusiness.java
@@ -2,6 +2,8 @@ package cn.timer.api.utils.router.business;
 import java.text.ParseException;
+import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,7 +47,7 @@ public class EvectionBusiness extends SpmkAssoBusiness {
 		String businessTrip = ObjectUtil.isNull(jsonObj.get("__businessTrip",FromData.class)) ? null : jsonObj.get("__businessTrip",FromData.class).getValue();
 		// 上传文件
 		String UploadAttachment = ObjectUtil.isNull(jsonObj.get("UploadAttachment",FromData.class)) ? null : jsonObj.get("UploadAttachment",FromData.class).getValue();
+		System.out.println(approveId);
 		AttEvectionApprovalDto eaD = AttEvectionApprovalDto
 				.builder()
 				.userid(id)

--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -176,7 +176,7 @@ config-8timer:
  register-company-max-num: 100 #默认最大公司数量
  register-childAccount-max-num: 10 #默认最大子账号数量
  Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时人事管家
+    PROJECT_NAME: 8小时协同办公 #8小时人事管家
    REGION_ID: cn-shenzhen
    ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
    SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR

--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -151,7 +151,7 @@ config-8timer:
  register-company-max-num: 100
  register-childAccount-max-num: 10
  Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时人事管家
+    PROJECT_NAME: 8小时协同办公 #8小时人事管家
    REGION_ID: cn-shenzhen
    ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
    SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR

--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -150,7 +150,7 @@ config-8timer:
  register-company-max-num: 100
  register-childAccount-max-num: 10
  Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时人事管家
+    PROJECT_NAME: 8小时协同办公 #8小时人事管家
    REGION_ID: cn-shenzhen
    ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
    SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR

--- a/src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
+++ b/src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
@@ -22,6 +22,8 @@
            <result column="empname" property="empname" />
            <result column="department" property="department" />
            <result column="rztime" property="rztime" />
+            <result column="userid" property="userid" />
+            <result column="balancedays" property="balancedays" />
            <collection property="balanceTo" ofType="cn.timer.api.dto.kqmk.BalanceSheetDataDto">
 		   		<result column="leaverulesid" property="leaverulesid"/>
 		   		<result column="balancedays" property="balancedays"/>
@@ -114,6 +116,14 @@
 			and emp.job_status in (0,1)
    </select>
+    <select id="selectleavebalanceList" resultMap="LeaveBalanceMap">
+    	select bal.userid,SUM(bal.balance_days) as balancedays 
+			from kqgl_asso_leave_balance bal 
+			where bal.leave_rules_id = #{leaverulesid} and bal.userid = #{userid}
+			GROUP BY bal.userid
+    </select>
 	<!-- 
    <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoLeaveBalance">

--- a/src/main/resources/mapping/kqmk/KqglAssoLeaveRulesMapper.xml
+++ b/src/main/resources/mapping/kqmk/KqglAssoLeaveRulesMapper.xml
@@ -51,6 +51,20 @@
    		AND (leave_type = #{leavetype} OR is_open = #{isopen}) 
    </select>
+    <select id="selCompanywidedata" resultMap="BaseResultMap">
+    	SELECT <include refid="Base_Column_List" />
+    		FROM kqgl_asso_leave_rules 
+    		WHERE org_code = #{orgcode} 
+    		and apply = 0
+    		AND (leave_type = #{leavetype} OR is_open = #{isopen}) 
+    </select>
+    <select id="AssociatedHolidays" resultMap="BaseResultMap">
+    	SELECT * FROM kqgl_asso_leave_rules rul 
+		where rul.id in (select vic.leave_rules_id from kqgl_asso_rules_vice vic where vic.attgroup_id = #{attgroupid})
+    </select>
 	<insert id="insertleaverulesList" parameterType="java.util.List" >
 	    insert into kqgl_asso_leave_rules (name,company,leave_type,apply,create_time,create_userid,org_code,is_open,leave_balance,rules_type)
 	    <foreach collection="list" item="item" index="index" open="values " close="" separator=",">