修改BUG

src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java

@@ -10,6 +10,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantLock;
 
 
+import cn.timer.api.bean.dzht.DzhtAssoMbzj;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpEntity;
@@ -19,14 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
@@ -569,6 +565,18 @@ public class TimeCardController {
 		overrule.setRange(vice);
 		overrule.setRange(vice);
 		return ResultUtil.data(overrule,"操作成功!");
 		return ResultUtil.data(overrule,"操作成功!");
 	}
 	}
+	/**
+	 *	 是否开启假期规则
+	 */
+	@PutMapping(value = "/leave_rules_open")
+	@ApiOperation(value = "14.1：是否开启假期规则 ", httpMethod = "PUT", notes = "接口发布说明")
+	@ApiOperationSupport(order = 14)
+	public Result<Object> leaveRulesOpen(@RequestBody KqglAssoLeaveRulesDto kqglAssoLeaveRulesDto) {
+		UpdateWrapper<KqglAssoLeaveRules> updateWrapper = new UpdateWrapper<>();
+		updateWrapper.eq("id", kqglAssoLeaveRulesDto.getId()).set("is_open", kqglAssoLeaveRulesDto.getIsOpen());
+		KqglAssoLeaveRules.builder().build().update(updateWrapper);
+		return  ResultUtil.success();
+	}
 
 
 
 
 	@Autowired
 	@Autowired

src/main/java/cn/timer/api/dto/kqmk/KqglAssoMonthPunchSummaryDto.java

@@ -45,6 +45,9 @@ public class KqglAssoMonthPunchSummaryDto implements Serializable{
 	@ApiModelProperty(value = "工号 工号", example = "101")
 	@ApiModelProperty(value = "工号 工号", example = "101")
 	private Integer num;
 	private Integer num;
 
 
+	@ApiModelProperty(value = "自定义员工工号", example = "101")
+	private String customNum;
+
 	@ApiModelProperty(value = "部门 ", example = "部门")
 	@ApiModelProperty(value = "部门 ", example = "部门")
 	private String dept;
 	private String dept;
 
 

src/main/java/cn/timer/api/dto/zzgl/UpEmpDeptDto.java

@@ -20,6 +20,12 @@ public class UpEmpDeptDto implements Serializable{
 	@ApiModelProperty(value="部门岗位id",example="1")
 	@ApiModelProperty(value="部门岗位id",example="1")
 	private Integer dpetId;
 	private Integer dpetId;
 
 
+	@ApiModelProperty(value="部门",example="'部门'")
+	private String dept;
+
+	@ApiModelProperty(value="'职位'",example="''职位''")
+	private String post;
+	
 	@ApiModelProperty(value="员工工号",example="2")
 	@ApiModelProperty(value="员工工号",example="2")
 	private List<Integer> empNum;
 	private List<Integer> empNum;
 
 

src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml

@@ -140,6 +140,7 @@
                 <result column="last_modified" property="lastModified" />
                 <result column="last_modified" property="lastModified" />
 
 
 				<result column="turnover_status" property="turnover_status" />
 				<result column="turnover_status" property="turnover_status" />
+				<result column="custom_num" property="customNum" />
                 
                 
                 <collection property="balanceTo" ofType="cn.timer.api.dto.kqmk.BalanceSheetDataDto">
                 <collection property="balanceTo" ofType="cn.timer.api.dto.kqmk.BalanceSheetDataDto">
                 	<id column="yzid" property="yzid"/>
                 	<id column="yzid" property="yzid"/>
@@ -284,14 +285,18 @@
      <select id="AttendanceSummaryData" resultMap="SummarydataMap">
      <select id="AttendanceSummaryData" resultMap="SummarydataMap">
 			select sum.*,
 			select sum.*,
 		   		(select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group) as attname,
 		   		(select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group) as attname,
-     	       IFNULL((select em.job_status from yggl_main_lzb em where em.emp_num = sum.num and em.org_code = sum.org_code LIMIT 1),0) as turnover_status
+	   			IFNULL((select em.job_status from yggl_main_lzb em where em.emp_num = sum.num and em.org_code = sum.org_code LIMIT 1),0) as turnover_status,
+		 		yme.custom_num AS custom_num
 			from kqgl_asso_month_punch_summary sum
 			from kqgl_asso_month_punch_summary sum
+			LEFT JOIN yggl_main_emp yme ON yme.org_code = sum.org_code and yme.emp_num=sum.num
 			where sum.org_code = #{param.orgCode}
 			where sum.org_code = #{param.orgCode}
 			and sum.belong_year = #{param.year}
 			and sum.belong_year = #{param.year}
 			and sum.belong_month = #{param.month}
 			and sum.belong_month = #{param.month}
 			<if test="param.query != null and param.query != ''">
 			<if test="param.query != null and param.query != ''">
 				and (	sum.`name` like CONCAT('%',#{param.query},'%') or 
 				and (	sum.`name` like CONCAT('%',#{param.query},'%') or 
-						sum.num like CONCAT('%',#{param.query},'%'))
+						sum.num like CONCAT('%',#{param.query},'%')
+						or yme.custom_num like CONCAT('%',#{param.query},'%')
+						)
 			</if>
 			</if>
 			<if test="param.attid != null and param.attid != ''">
 			<if test="param.attid != null and param.attid != ''">
 				and sum.att_group = #{param.attid}
 				and sum.att_group = #{param.attid}