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

1a1a9e41 · 邓实川 · 982181b4 · b67057c6 · 1a1a9e41 · 1a1a9e41
Commit 1a1a9e41 authored Jun 11, 2020 by 邓实川
41 changed files
--- a/src/main/java/cn/timer/api/bean/jxgl/JxglAppraisalIndicators.java
+++ b/src/main/java/cn/timer/api/bean/jxgl/JxglAppraisalIndicators.java
@@ -62,6 +62,9 @@ public class JxglAppraisalIndicators extends Model<JxglAppraisalIndicators> {
 	@ApiModelProperty(value = "类型 0 非固定 1 固定", example = "0")
 	private Integer type;
+	@ApiModelProperty(value = "是否可编辑权重", example = "0 是 1否")
+	private Integer isEditWeight;
 	@TableField(exist = false)
 	private List<JxglAppraisalIndicatorsAssessment> appraisalIndicatorsAssessments;

--- a/src/main/java/cn/timer/api/bean/jxgl/JxglAppraisalIndicatorsT.java
+++ b/src/main/java/cn/timer/api/bean/jxgl/JxglAppraisalIndicatorsT.java
@@ -63,8 +63,10 @@ public class JxglAppraisalIndicatorsT extends Model<JxglAppraisalIndicatorsT> {
 	@ApiModelProperty(value = "类型", example = "0 非固定 1 固定")
 	private Integer type;
+	@ApiModelProperty(value = "是否可编辑权重", example = "0 是 1否")
+	private Integer isEditWeight;
 	@TableField(exist = false) // 是否转换
 	@ApiModelProperty(value = "考核项模板", example = "")
 	private List<JxglAppraisalItemT> appraisalItemTs;
 }
\ No newline at end of file
--- a/src/main/java/cn/timer/api/bean/jxgl/JxglAppraisalT.java
+++ b/src/main/java/cn/timer/api/bean/jxgl/JxglAppraisalT.java
@@ -5,6 +5,10 @@ import java.util.List;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Null;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -12,6 +16,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import cn.timer.api.config.exception.ValidationMsg;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -38,35 +43,44 @@ public class JxglAppraisalT extends Model<JxglAppraisalT> {
 	@Id
 	@GeneratedValue
 	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "编号", example = "10")
-	@ApiModelProperty(value = "编号 编号", example = "10")
 	private Integer id;
-	@ApiModelProperty(value = "企业id 企业id", example = "10")
+	@ApiModelProperty(value = "企业id", example = "10")
 	private Integer orgCode;
+	@NotBlank(message = ValidationMsg.NOTBLANK)
 	@ApiModelProperty(value = "名称", example = "名称")
 	private String name;
 	@ApiModelProperty(value = "考核说明", example = "考核说明")
 	private String appraisalExplain;
+	@Null(message = ValidationMsg.NULL)
 	@TableField(fill = FieldFill.INSERT)
 	@ApiModelProperty(value = "创建时间", example = "2020-10-10 10:10:10")
 	private Date createTime;
+	@Null(message = ValidationMsg.NULL)
 	@TableField(fill = FieldFill.UPDATE)
 	@ApiModelProperty(value = "更新时间", example = "2020-10-10 10:10:10")
 	private Date updateTime;
-	@ApiModelProperty(value = "是否可编辑 限制员工的权限", example = "10")
+	@ApiModelProperty(value = "是否可编辑 限制员工的权限", example = "0")
 	private Integer isEdit;
-	@ApiModelProperty(value = "是否使用固定", example = "10")
+	@Min(value = 0,message = ValidationMsg.MIN)
+	@Max(value = 1,message = ValidationMsg.MAX)
+	@ApiModelProperty(value = "是否使用固定", example = "0")
 	private Integer isUseFixd;
-	@ApiModelProperty(value = "是否使用非固定", example = "10")
+	@Min(value = 0,message = ValidationMsg.MIN)
+	@Max(value = 1,message = ValidationMsg.MAX)
+	@ApiModelProperty(value = "是否使用非固定", example = "0")
 	private Integer isUseNotFixd;
 	@TableField(exist = false) // 是否转换
 	@ApiModelProperty(value = "考核指标模板", example = "")
 	private List<JxglAppraisalIndicatorsT> appraisalIndicatorsTs;
 }
\ No newline at end of file
--- a/src/main/java/cn/timer/api/bean/jxgl/JxglBasicSetting.java
+++ b/src/main/java/cn/timer/api/bean/jxgl/JxglBasicSetting.java
@@ -5,6 +5,7 @@ import java.util.Date;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.validation.Valid;
+import javax.validation.constraints.Min;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -12,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import cn.timer.api.config.exception.ValidationMsg;
 import cn.timer.api.config.validation.ValidList;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -39,13 +41,14 @@ public class JxglBasicSetting extends Model<JxglBasicSetting> {
    @Id
    @GeneratedValue
    @TableId (type = IdType.AUTO)
-	@ApiModelProperty(value="编号 编号",example="101")
+	@ApiModelProperty(value="编号",example="101")
    private Integer id;
 	@ApiModelProperty(value="企业id 企业id",example="101")
    private Integer orgCode;
-	@ApiModelProperty(value="最高分 最高分",example="101")
+	@Min(value = 0,message = ValidationMsg.MIN)
+	@ApiModelProperty(value="最高分",example="101")
    private Integer maxScore;
 	@TableField(fill = FieldFill.INSERT)

--- a/src/main/java/cn/timer/api/bean/jxgl/JxglPerformanceRating.java
+++ b/src/main/java/cn/timer/api/bean/jxgl/JxglPerformanceRating.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import cn.timer.api.config.exception.ValidationMsg;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -41,19 +42,19 @@ public class JxglPerformanceRating extends Model<JxglPerformanceRating> {
 	@ApiModelProperty(value = "绩效基础设置id", example = "10")
 	private Integer basicSettingId;
-	@NotBlank(message = "等级名称 不能为空")
+	@NotBlank(message = ValidationMsg.NOTBLANK)
 	@ApiModelProperty(value = "等级名称", example = "等级名称")
 	private String name;
-	@NotNull(message = "区间最小分数 不能为空")
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "区间最小分数", example = "10")
 	private Integer sectionMinScore;
-	@NotNull(message = "区间最大分数 不能为空")
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "区间最大分数", example = "10")
 	private Integer sectionMaxScore;
-	@NotNull(message = "排序 不能为空")
+//	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "排序", example = "10")
 	private Integer ranks;

--- a/src/main/java/cn/timer/api/bean/kqgl/PunchRecord.java
+++ b/src/main/java/cn/timer/api/bean/kqgl/PunchRecord.java
@@ -38,6 +38,7 @@ public class PunchRecord implements Serializable {
 	private String remarks;// 考勤备注
 	private Integer punchmode;// 考勤机打卡方式==>1：指紋；2：人脸；3：密码；4：ID卡
 	private String punchequipment;// 打卡设备
+	private String commentary;
 	private String username = "";
 	private String dept = "";
@@ -45,6 +46,8 @@ public class PunchRecord implements Serializable {
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	public Integer getId() {
 		return id;
 	}
@@ -262,4 +265,12 @@ public class PunchRecord implements Serializable {
 		this.post = post;
 	}
+	public String getCommentary() {
+		return commentary;
+	}
+	public void setCommentary(String commentary) {
+		this.commentary = commentary;
+	}
 }
\ No newline at end of file
--- a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoBcsz.java
+++ b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoBcsz.java
@@ -122,7 +122,7 @@ public class KqglAssoBcsz extends Model<KqglAssoBcsz> {
 	@ApiModelProperty(value = "上下班次数(1/2/3  最大值为3)", example = "101")
 	private Integer sxbcs;
-	@ApiModelProperty(value = "是否允许下班打卡(0：否；1：是) 是否允许下班打卡(0：否；1：是)", example = "101")
+	@ApiModelProperty(value = "是否下班不用打卡(0：否；1：是)", example = "101")
 	private Integer isXbdk;
 	@ApiModelProperty(value = "允许迟到分钟数 允许迟到分钟数", example = "101")

--- a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
+++ b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
@@ -98,5 +98,8 @@ public class KqglAssoDkjl extends Model<KqglAssoDkjl> {
 	@ApiModelProperty(value = "打卡设备 ", example = "打卡设备")
 	private String punchequipment;
+	@ApiModelProperty(value="解释 ",example="解释")
+    private String commentary;
 }
\ No newline at end of file
--- a/src/main/java/cn/timer/api/bean/sbgjj/SbgjjAssoDetailed.java
+++ b/src/main/java/cn/timer/api/bean/sbgjj/SbgjjAssoDetailed.java
+package cn.timer.api.bean.sbgjj;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+/**
+ * @author lal 2020-06-08
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "sbgjj_asso_detailed")
+@ApiModel("月结明细")
+public class SbgjjAssoDetailed extends Model<SbgjjAssoDetailed> {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@Id
+	@GeneratedValue
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "id id", example = "101")
+	private Integer id;
+	@ApiModelProperty(value = "用户id 用户id", example = "101")
+	private Integer userId;
+	@ApiModelProperty(value = "时间 ", example = "年月日")
+	private String attributionTime;
+	@ApiModelProperty(value = "参保方案明细id 参保方案明细id", example = "101")
+	private Integer cbfzmxId;
+	@ApiModelProperty(value = "险种名称 险种名称", example = "101")
+	private String coverageName;
+	@ApiModelProperty(value = "个人金额 ", example = "个人金额")
+	private Double personalAmount;
+	@ApiModelProperty(value = "公司金额 ", example = "公司金额")
+	private Double companyAmount;
+	@ApiModelProperty(value = "险种类型 1：社保；2：公积金", example = "101")
+	private Integer xzType;
+	@ApiModelProperty(value = "企业组织代码 ", example = "企业组织代码")
+	private Integer orgCode;
+	@ApiModelProperty(value = "生成时间 生成时间", example = "101")
+	private Long addtime;
+}
\ No newline at end of file
--- a/src/main/java/cn/timer/api/controller/jxgl/JxglController.java
+++ b/src/main/java/cn/timer/api/controller/jxgl/JxglController.java
--- a/src/main/java/cn/timer/api/controller/kqgl/AttController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/AttController.java
@@ -1263,7 +1263,7 @@ public class AttController {
 	@GetMapping(value="/AttReminderStaff/{id}")
 	@ApiOperation(value = "提醒人员", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 34)
-	public Result<List<YgglMainEmp>> getAttReminderStaff(@PathVariable("id") Integer id) {
+	public Result<List<YgglMainEmp>> getAttReminderStaff(@PathVariable("id") Integer id,@CurrentUser UserBean userBean) {
 		List<YgglMainEmp> yggl = new ArrayList<YgglMainEmp>();
 		AttendanceGroup attgro = attendancegroupservice.selectByPrimaryKey(id);
@@ -1276,7 +1276,7 @@ public class AttController {
 			launchsstr = txry.substring(0,txry.length() - 1);
 			for(int i=0;i<launchsArray.length;i++){
 //				System.out.println(launchsArray[i]);
-				YgglMainEmp txyg = attendancegroupservice.selectByPrimaryByempNum(Integer.valueOf(launchsArray[i]));
+				YgglMainEmp txyg = attendancegroupservice.selectByPrimaryByempNum(Integer.valueOf(launchsArray[i]),userBean.getOrgCode());
 				YgglMainEmp txyy = YgglMainEmp.builder().build();///
 				txyy.setId(txyg.getId());

--- 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/ClockInTool.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
@@ -23,6 +23,44 @@ public class ClockInTool {
 	static SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM-dd");
 	/**
+	 * @param timeStr 修改的时间
+	 * @param num 修改数字
+	 * @param numtime
+	 * @return 1：增加一年、2：增加一天、3：减10天、4：增加一个月
+	 */
+	public static String requires_extra_times(String timeStr, int num,int numtime,int daft) {
+		DateFormat df;
+		if(daft == 1) {
+			df = new SimpleDateFormat("yyyy-MM-dd");
+		}else {
+			df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		}
+		Date date = null;
+		try {
+			date = df.parse(timeStr);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);// 设置起时间
+		if(numtime == 1) {
+			cal.add(Calendar.YEAR, num);// 增加一年
+		}else if(numtime == 2) {
+			cal.add(Calendar.DATE, num);//增加一天
+		}else if(numtime == 3) {
+			cal.add(Calendar.DATE, num);//减10天
+		}else if(numtime == 4){
+			cal.add(Calendar.MONTH, num);//增加一个月
+		}else if(numtime == 5) {
+			cal.add(Calendar.HOUR, num);
+		}
+		return df.format(cal.getTime());
+	}
+	/**
 	 * @param timeStr
 	 * @param addnumber
 	 * @return 通过java Calendar 实现时间+ 分钟
@@ -432,5 +470,18 @@ public class ClockInTool {
 		res = String.valueOf(ts);
 		return res;
 	}
+	/**
+	 * 时间戳转换时间
+	 */
+    public static String stampToDate(String s){
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long lt = new Long(s);
+        Date date = new Date(lt);
+        res = simpleDateFormat.format(date);
+        return res;
+    }
 }
--- a/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
@@ -167,9 +167,36 @@ public class TimeCardController {
 	@ApiOperation(value = "2：新增班次信息", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 2)
 	public Result<KqglAssoBcsz> ShiftInformation(@CurrentUser UserBean userBean,@RequestBody KqglAssoBcsz shif) {
+			String sdf = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 			shif.setQyid(userBean.getOrgCode());
 			shif.setLusjTime(new Date().getTime());
 			shif.setLuryid(userBean.getEmpNum());//录入人员
+			boolean xbbydk = false;
+			if(shif.getIsXbdk() == 1) {
+				xbbydk = true;
+			}
+			if(shif.getSxbcs() == 1) {
+				if(xbbydk) {
+					shif.setXbdk1("");
+					String asd = ClockInTool.addtime(sdf+" "+shif.getSbdk1()+":00", "1").substring(11, 16);
+					shif.setXbdk1(asd);
+				}
+			}else if(shif.getSxbcs() == 2) {
+				if(xbbydk) {
+					shif.setXbdk2("");
+					String asd = ClockInTool.addtime(sdf+" "+shif.getSbdk2()+":00", "1").substring(11, 16);
+					shif.setXbdk2(asd);
+				}
+			}else {
+				if(xbbydk) {
+					shif.setXbdk3("");
+					String asd = ClockInTool.addtime(sdf+" "+shif.getSbdk3()+":00", "1").substring(11, 16);
+					shif.setXbdk3(asd);
+				}
+			}
 			if(kqglassobcszmapper.insert(shif)>0){
 				return ResultUtil.data(shif, "新增班次成功");
 			}else{
@@ -959,28 +986,39 @@ public class TimeCardController {
 	@ApiOperation(value = "39：删除考勤组", httpMethod = "DELETE", notes = "接口发布说明")
 	@ApiOperationSupport(order = 39)
 	public Result<Integer> DelAttendanceGroup(@CurrentUser UserBean userBean,@PathVariable("id") Integer id) {
-		 if(KqglMainKqz.builder().id(id).build().deleteById()) {
 				List<UserAttendanceRel> attusers = userattendancerelmapper.selectAttendanceOfficerByKqzid(id, userBean.getOrgCode());//该考勤组人数
 				//该考勤组所绑定的考勤机
 				List<KqglAssoKqzdkfs> kqjs = kqglassokqzdkfsmapper.selectList(new QueryWrapper<KqglAssoKqzdkfs>().lambda().eq(KqglAssoKqzdkfs::getKqzId, id).eq(KqglAssoKqzdkfs::getType, 1));
 				String DevId = "";
 				for(KqglAssoKqzdkfs abp:kqjs) {
 					KqglAssoKqj kqj = KqglAssoKqj.builder().id(abp.getDkfsid()).build().selectById();//查询考勤机“序列号”
-					DevId = kqj.getCode();
+					if(kqj != null) {
-					for(UserAttendanceRel user:attusers) {
+						DevId = kqj.getCode();
-						String user_id = user.getEmpnum();//"1692";//要删除的考勤组里面用户ID
+						for(UserAttendanceRel user:attusers) {
+							String user_id = user.getEmpnum();//"1692";//要删除的考勤组里面用户ID
-						String url = mac_command+"/deleteUser";
-				        HttpHeaders headers = new HttpHeaders();
+							String url = mac_command+"/deleteUser";
-				        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+					        HttpHeaders headers = new HttpHeaders();
-				        params.add("devId", DevId);
+					        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
-				        params.add("userId", user_id);
+					        params.add("devId", DevId);
-				        RestTemplate restTemplate = new RestTemplate();
+					        params.add("userId", user_id);
-				        HttpEntity httpEntity = new HttpEntity(params, headers);
+					        RestTemplate restTemplate = new RestTemplate();
-				        ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);
+					        HttpEntity httpEntity = new HttpEntity(params, headers);
-				        System.err.print(request.getBody());
+					        try {
+								ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);
+								System.err.print(request.getBody());
+							} catch (RestClientException e) {
+								System.err.println("提示：考勤机服务出错");
+								return ResultUtil.error("删除失败：提示：考勤机服务出错");
+							}
+						}
 					}
 				}
+		if(KqglMainKqz.builder().id(id).build().deleteById()) {	
 			userequirelationmapper.deleteBykqzid(id);
 			//删除考勤组绑定的打卡方式
@@ -2168,8 +2206,14 @@ public class TimeCardController {
 			Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(data,"yyyy-MM-dd")).getTime();
 			String attdate_ = new SimpleDateFormat("yy-MM-dd").format(Double.valueOf(startDate));//转换打卡时间格式
+			int type = 0;
+			if((chpunchr.getClocktype())%2 > 0){
+				type = 1;
+			}else {
+				type = 2;
+			}
-			KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(changed_time).results(results).userId(chpunchr.getNum()).type(chpunchr.getClocktype()).status(9).sort(chpunchr.getClocktype())
+			KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(changed_time).results(results).userId(chpunchr.getNum()).type(type).status(9).sort(chpunchr.getClocktype())
 					.cardType(3).qyid(userBean.getOrgCode()).attdate(attdate_+" "+ClockInTool.dateToWeek2(data)).attime(clock_time_).dkmxid(dkmx.getId()).bcid(chpunchr.getBcszid()).remarks("管理员改为正常").punchmode(0)
 					.punchequipment("").build();
 			if (!pre.insert()) {

--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -31,6 +30,7 @@ import cn.timer.api.bean.kqmk.KqglAssoRelationSummary;
 import cn.timer.api.bean.kqmk.KqglAssoTeshu;
 import cn.timer.api.bean.kqmk.KqglAssoZhoupaiban;
 import cn.timer.api.bean.kqmk.KqglMainKqz;
+import cn.timer.api.bean.qyzx.QyzxEntInfoM;
 import cn.timer.api.controller.kqgl.ClockInTool;
 import cn.timer.api.dao.kqgl.AttendanceWeeklySchMapper;
 import cn.timer.api.dao.kqgl.PunchCardDetailsMapper;
@@ -104,8 +104,8 @@ public class AttendanceTaskTiming{
 	 * @throws ParseException 
 	 */
-	 //3.添加定时任务
+	 //3.添加定时任务 每天下午七点执行一次
-     @Scheduled(cron = "0 10 15 * * ?")
+     @Scheduled(cron = "0 34 10 * * ?")
    //或直接指定时间间隔，例如：5秒
    //@Scheduled(fixedRate=5000)
@@ -142,7 +142,7 @@ public class AttendanceTaskTiming{
 			ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));  
 			Long endDate = DateUtil.getnowEndTime(23,DateUtil.getStringTime(sdf1.format(ca.getTime()),"yyyy-MM-dd")).getTime();
-//			List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>());//系统中的所有公司  所有未到期的公司
+			List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>());//系统中的所有公司  所有未到期的公司
 			String str = new SimpleDateFormat("yyyy-MM-dd").format(new Date()).toString();//
 			String ttstr = new SimpleDateFormat("yyyy-MM").format(new Date()).toString();//
@@ -154,8 +154,8 @@ public class AttendanceTaskTiming{
 			KqglAssoMonthPunchSummary.builder().build().delete(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getBelongYear, year).eq(KqglAssoMonthPunchSummary::getBelongMonth, month));
-//			for(int t = 0;t<orgcodelist.size();t++){
+			for(int t = 0;t<orgcodelist.size();t++){
-				int org_code = 117;//orgcodelist.get(t).getId();//企业组织代码
+				int org_code = orgcodelist.get(t).getId();//企业组织代码
 				List<AdditionalDto> userlist = kqglassoleavebalancemapper.selectAdditionalList(org_code);
 				for(AdditionalDto user : userlist) {
 					double traveltotal = 0,egresstotal = 0,overtimetotal = 0;
@@ -684,7 +684,7 @@ public class AttendanceTaskTiming{
 					 summary.setDay31(noticesArray[30]);
 					 summary.insert();
 				}
-//			}
+			}
 //			KqglTaskTiming.builder().task("AttendanceTask").id(sockid).executionStatus(0).lastExecutionTime(new Date().getTime()).build().updateById();
 //			return new Exception().getStackTrace()[0].getMethodName();

--- a/src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java
+++ b/src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -19,7 +20,6 @@ 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;
 import cn.hutool.core.util.StrUtil;
@@ -27,6 +27,7 @@ import cn.timer.api.bean.sbgjj.SbgjjAdminCbry;
 import cn.timer.api.bean.sbgjj.SbgjjAreaInfo;
 import cn.timer.api.bean.sbgjj.SbgjjAssoCbfa;
 import cn.timer.api.bean.sbgjj.SbgjjAssoCbfzmx;
+import cn.timer.api.bean.sbgjj.SbgjjAssoDetailed;
 import cn.timer.api.bean.sbgjj.SbgjjAssoYjzd;
 import cn.timer.api.bean.sbgjj.SbgjjTypeDetails;
 import cn.timer.api.bean.sbgjj.SbgjjYjCsbh;
@@ -37,6 +38,7 @@ import cn.timer.api.dao.sbgjj.SbgjjAdminCbryMapper;
 import cn.timer.api.dao.sbgjj.SbgjjAreaInfoMapper;
 import cn.timer.api.dao.sbgjj.SbgjjAssoCbfaMapper;
 import cn.timer.api.dao.sbgjj.SbgjjAssoCbfzmxMapper;
+import cn.timer.api.dao.sbgjj.SbgjjAssoDetailedMapper;
 import cn.timer.api.dao.sbgjj.SbgjjAssoYjzdMapper;
 import cn.timer.api.dao.sbgjj.SbgjjTypeDetailsMapper;
 import cn.timer.api.dao.sbgjj.SbgjjYjCsbhMapper;
@@ -446,6 +448,26 @@ public class SocialSecurityFundController {
 		return new ResponseResult().success("成功", cbrylist);
 	}
+	/**
+	 * 	参保员工号-根据 模糊 + 高級查詢-分页****************************************************************8
+	 */
+	@PostMapping(value = "/insured_employees")
+	@ApiOperation(value = "参保员工号-根据 模糊 + 高級查詢-分页", httpMethod = "POST", notes = "接口发布说明")
+	@ApiOperationSupport(order = 34)
+	public Result<Object> InsuredEmployees(@CurrentUser UserBean userBean, @Validated @RequestBody InspersonnelDto inspe){
+			IPage<InsuredPersonnelDto> page = new Page<InsuredPersonnelDto>(
+					inspe.getCurrentPage() == null ? 1 : inspe.getCurrentPage(),
+							inspe.getTotalPage() == null ? 10 : inspe.getTotalPage());
+			inspe.setOrgcode(userBean.getOrgCode());
+			IPage<InsuredPersonnelDto> pageAs = sbgjjadmincbrymapper.InsuredEmployees(page, inspe);
+			List<InsuredPersonnelDto> listAs = pageAs.getRecords();
+			return ResultUtil.data(pageAs, listAs, "操作成功!");
+	}
 	@GetMapping(value = "/insure/{name}")
@@ -476,6 +498,9 @@ public class SocialSecurityFundController {
 	}
+	@Autowired
+	private SbgjjAssoDetailedMapper sbgjjassodetailedmapper;
 	@PostMapping(value = "/insuplan")
 	@ApiOperation(value = "投保", httpMethod = "POST", notes = "接口发布说明")
 	public ResponseResult InsurancePlan(@CurrentUser UserBean userBean,@RequestBody InsureDto insuredto) {
@@ -532,6 +557,8 @@ public class SocialSecurityFundController {
 				sbgjjadmincbrymapper.insertsbgjjadmincbry(cbry);
 				int cbryid = cbry.getId();//参保人员
+				List<SbgjjAssoDetailed> detalis = new ArrayList<SbgjjAssoDetailed>();
 				//*************************************社保******************************************************
 				double gssocial = 0;//公司社保总
 				double grsocial = 0;//个人社保总
@@ -541,6 +568,9 @@ public class SocialSecurityFundController {
 				//社保******
 					//公司
+					SbgjjAssoDetailed.builder().build().delete(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, Integer.valueOf(usernums[f])).eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode())
+							.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getJnmouth()));
 					for(SbgjjAssoCbfzmx sbjs:shebaolist) {
 						double jishuxx = 0;
 						double preval = 0;
@@ -557,10 +587,30 @@ public class SocialSecurityFundController {
 							double gsh = gsbili.divide(bfb).doubleValue();
 							preval = formatDouble1(Double.valueOf(jishuxx)*gsh);
 						}
+						SbgjjAssoDetailed deta = SbgjjAssoDetailed.builder().build();
+						deta.setUserId(Integer.valueOf(usernums[f]));
+						deta.setAttributionTime(insuredto.getJnmouth());//
+						deta.setCbfzmxId(sbjs.getId());
+						deta.setCoverageName(sbjs.getXz());
+						deta.setPersonalAmount(0.0);
+						deta.setCompanyAmount(preval);//公司金额
+						deta.setXzType(1);//险种类型 1：社保；2：公积金
+						deta.setOrgCode(userBean.getOrgCode());
+						deta.setAddtime(new Date().getTime());
+						detalis.add(deta);
+						System.out.println("公司-社保："+preval);
 						gssocial += preval;
 					}
 					System.out.println("公司社保总："+formatDouble1(gssocial));
+					if(detalis.size()>0){
+						sbgjjassodetailedmapper.insertsbgjjassodetailedList(detalis);
+					}
 					//个人
 					for(SbgjjAssoCbfzmx sbjsgr:shebaolist) {
@@ -579,6 +629,16 @@ public class SocialSecurityFundController {
 							double gsh = gsbigr.divide(bfgr).doubleValue();
 							preval = formatDouble1(Double.valueOf(jishuxxgr)*gsh);
 						}
+						SbgjjAssoDetailed dtd = sbgjjassodetailedmapper.selectOne(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, Integer.valueOf(usernums[f]))
+								.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, sbjsgr.getId()).eq(SbgjjAssoDetailed::getCoverageName, sbjsgr.getXz())
+								.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()));
+						if(dtd != null) {
+							SbgjjAssoDetailed.builder().id(dtd.getId()).personalAmount(preval).build().updateById();
+						}
+						System.out.println("个人-社保："+preval);
 						grsocial += preval;
 					}
@@ -637,6 +697,21 @@ public class SocialSecurityFundController {
 							double gsh = gsbili.divide(bfb).doubleValue();
 							preval = formatDouble1(Double.valueOf(jishuxx)*gsh);
 						}
+						SbgjjAssoDetailed deta = SbgjjAssoDetailed.builder().build();
+						deta.setUserId(Integer.valueOf(usernums[f]));
+						deta.setAttributionTime(insuredto.getJnmouth());//
+						deta.setCbfzmxId(gjjgs.getId());
+						deta.setCoverageName(gjjgs.getXz());
+						deta.setPersonalAmount(0.0);
+						deta.setCompanyAmount(preval);//公司金额
+						deta.setXzType(2);//险种类型 1：社保；2：公积金
+						deta.setOrgCode(userBean.getOrgCode());
+						deta.setAddtime(new Date().getTime());
+						deta.insert();
+						System.out.println("公司-公积金："+preval);
 						gsfund += preval;
 					}
 					System.out.println("公司公积金总："+formatDouble1(gsfund));
@@ -660,6 +735,14 @@ public class SocialSecurityFundController {
 							preval = formatDouble1(Double.valueOf(jishuxxgr)*gsh);
 						}
+						SbgjjAssoDetailed dtd = sbgjjassodetailedmapper.selectOne(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, Integer.valueOf(usernums[f]))
+								.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, gjjgr.getId()).eq(SbgjjAssoDetailed::getCoverageName, gjjgr.getXz())
+								.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()));
+						if(dtd!=null) {
+							SbgjjAssoDetailed.builder().id(dtd.getId()).personalAmount(preval).build().updateById();
+						}
+						System.out.println("个人-公积金："+preval);
 						grgsfund += preval;
 					}
 					System.out.println("个人公积金总："+formatDouble1(grgsfund));

--- a/src/main/java/cn/timer/api/dao/kqgl/AttendanceGroupMapper.java
+++ b/src/main/java/cn/timer/api/dao/kqgl/AttendanceGroupMapper.java
@@ -39,7 +39,7 @@ public interface AttendanceGroupMapper {
    List<YgglMainEmp> selectAttendanceOfficer(String orgCode,String text);
-    YgglMainEmp selectByPrimaryByempNum(Integer empNum);
+    YgglMainEmp selectByPrimaryByempNum(Integer empNum,Integer orgCode);
    List<YgglMainEmp> EmployeeListByorgCode(String orgCode);

--- a/src/main/java/cn/timer/api/dao/sbgjj/SbgjjAdminCbryMapper.java
+++ b/src/main/java/cn/timer/api/dao/sbgjj/SbgjjAdminCbryMapper.java
 package cn.timer.api.dao.sbgjj;
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import cn.timer.api.bean.sbgjj.SbgjjAdminCbry;
 import cn.timer.api.bean.yggl.YgglMainEmp;
@@ -23,4 +25,7 @@ public interface SbgjjAdminCbryMapper extends BaseMapper<SbgjjAdminCbry> {
 	List<YgglMainEmp> EmployeeListByorgCode(int orgCode);
+	IPage<InsuredPersonnelDto> InsuredEmployees(IPage<InsuredPersonnelDto> page,@Param("param") InspersonnelDto inspe);
 }
--- a/src/main/java/cn/timer/api/dao/sbgjj/SbgjjAssoDetailedMapper.java
+++ b/src/main/java/cn/timer/api/dao/sbgjj/SbgjjAssoDetailedMapper.java
+package cn.timer.api.dao.sbgjj;
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.timer.api.bean.sbgjj.SbgjjAssoDetailed;
+/**
+*  月结明细
+* @author Tang 2020-06-08
+*/
+@Repository
+public interface SbgjjAssoDetailedMapper extends BaseMapper<SbgjjAssoDetailed> {
+	int insertsbgjjassodetailedList(List<SbgjjAssoDetailed> sbgjjassodetailed);
+}
--- a/src/main/java/cn/timer/api/dto/jxgl/AppraisalAssessment.java
+++ b/src/main/java/cn/timer/api/dto/jxgl/AppraisalAssessment.java
@@ -2,6 +2,9 @@ package cn.timer.api.dto.jxgl;
 import java.io.Serializable;
+import javax.validation.constraints.NotNull;
+import cn.timer.api.config.exception.ValidationMsg;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,6 +22,7 @@ public class AppraisalAssessment implements Serializable{
 	 */
 	private static final long serialVersionUID = 1L;
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "考核id", example = "1")
 	private Integer appraisalId;
@@ -28,6 +32,7 @@ public class AppraisalAssessment implements Serializable{
 	@ApiModelProperty(value = "考核评定id", example = "1")
 	private Integer appraisalAssessmentId;
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "评分", example = "86")
 	private String score;

--- a/src/main/java/cn/timer/api/dto/jxgl/AppraisalQuery.java
+++ b/src/main/java/cn/timer/api/dto/jxgl/AppraisalQuery.java
@@ -28,7 +28,7 @@ public class AppraisalQuery extends Page{
 	@ApiModelProperty(value = "姓名、手机号", example = "")
 	private String query;
-	@Max(value = 4,message = ValidationMsg.MAX+" 只能为 0目标填写 1目标确认 2自评 3上级评分 4 结果确认 5考核完成 6终止考核 7绩效归档")
+	@Max(value = 7,message = ValidationMsg.MAX+" 只能为 0目标填写 1目标确认 2自评 3上级评分 4 结果确认 5考核完成 6终止考核 7绩效归档")
 	@Min(value = 0,message = ValidationMsg.MIN+" 只能为 0目标填写 1目标确认 2自评 3上级评分 4 结果确认 5考核完成 6终止考核 7绩效归档")
 	@ApiModelProperty(value = "状态 0目标填写 1目标确认 2自评 3上级评分 4 结果确认 5考核完成 6终止考核 7绩效归档", example = "0")
 	private Integer sts;

--- a/src/main/java/cn/timer/api/dto/jxgl/AppraisalReject.java
+++ b/src/main/java/cn/timer/api/dto/jxgl/AppraisalReject.java
 package cn.timer.api.dto.jxgl;
+import javax.validation.constraints.NotNull;
+import cn.timer.api.config.exception.ValidationMsg;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,6 +15,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class AppraisalReject {
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "考核id", example = "")
 	private Integer id;

--- a/src/main/java/cn/timer/api/dto/jxgl/AppraisalUpdate.java
+++ b/src/main/java/cn/timer/api/dto/jxgl/AppraisalUpdate.java
@@ -4,11 +4,14 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import javax.validation.constraints.NotNull;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.timer.api.bean.jxgl.JxglAppraisal;
 import cn.timer.api.bean.jxgl.JxglAppraisalIndicators;
 import cn.timer.api.bean.jxgl.JxglAppraisalItem;
+import cn.timer.api.config.exception.ValidationMsg;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -26,6 +29,7 @@ public class AppraisalUpdate implements Serializable{
 	 */
 	private static final long serialVersionUID = 1L;
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "考核id", example = "16")
 	private Integer id;

--- a/src/main/java/cn/timer/api/dto/jxgl/AppraisalUpdateSts.java
+++ b/src/main/java/cn/timer/api/dto/jxgl/AppraisalUpdateSts.java
 package cn.timer.api.dto.jxgl;
+import javax.validation.constraints.NotNull;
+import cn.timer.api.config.exception.ValidationMsg;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,9 +15,11 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class AppraisalUpdateSts {
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "绩效考核id", example = "")
 	private Integer id;
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "状态", example = "")
 	private Integer sts;

--- a/src/main/java/cn/timer/api/dto/jxgl/MyPerformance.java
+++ b/src/main/java/cn/timer/api/dto/jxgl/MyPerformance.java
 package cn.timer.api.dto.jxgl;
-import javax.validation.constraints.NotNull;
-import cn.timer.api.config.exception.ValidationMsg;
 import cn.timer.api.utils.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -16,7 +13,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class MyPerformance extends Page {
-	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "员工id", example = "")
 	private Integer id;

--- a/src/main/java/cn/timer/api/dto/jxgl/ProcessNodeUpdate.java
+++ b/src/main/java/cn/timer/api/dto/jxgl/ProcessNodeUpdate.java
@@ -5,6 +5,7 @@ import java.util.Date;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.validation.constraints.NotNull;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -12,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import cn.timer.api.bean.jxgl.JxglProcessNode;
+import cn.timer.api.config.exception.ValidationMsg;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -29,12 +31,15 @@ public class ProcessNodeUpdate implements Serializable{
 	 */
 	private static final long serialVersionUID = 1L;
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "编号", example = "10")
 	private Integer id;
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "考核id", example = "10")
 	private Integer appraisalId;
+	@NotNull(message = ValidationMsg.NOTNULL)
 	@ApiModelProperty(value = "执行人id(员工id)", example = "10")
 	private Integer executorId;

--- a/src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java
+++ b/src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java
@@ -20,6 +20,7 @@ public class AttSchedule implements Serializable{
 	private Integer id;
 	private Integer sort;// 1:上班；2：下班； 3：上班；4:下班；5:上班；6:下班
+	private Integer nextday;//0:否；1:是
 	private Long time;
 	private Long starttime;
 	private Long endtime;

--- a/src/main/java/cn/timer/api/dto/kqmk/DailyDetailsDto.java
+++ b/src/main/java/cn/timer/api/dto/kqmk/DailyDetailsDto.java
@@ -19,6 +19,7 @@ public class DailyDetailsDto {
 	private String dept;// 部门
 	private String post;// 岗位
 	private String attname;// 考勤组名称
+	private Integer attpbfs;// 排班方式（1：固定排班；2：自由排班；3：自由工时）
 	private String attdate;// 考勤日期
 	private Integer userid;// 用户ID
 	private String data;// 日期

--- a/src/main/java/cn/timer/api/dto/sbgjj/InspersonnelDto.java
+++ b/src/main/java/cn/timer/api/dto/sbgjj/InspersonnelDto.java
@@ -10,10 +10,11 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class InspersonnelDto extends Page implements Serializable{/**
+public class InspersonnelDto extends Page implements Serializable {
-	 * 
+	/**
-	 */
+	* 
+	*/
 	private static final long serialVersionUID = 6982449363339703887L;
 	int orgcode;
 	String title;
-}	
+}
--- a/src/main/resources/mapping/jxgl/JxglAppraisalIndicatorsMapper.xml
+++ b/src/main/resources/mapping/jxgl/JxglAppraisalIndicatorsMapper.xml
@@ -11,6 +11,7 @@
                <result column="create_time" property="createTime" />
                <result column="update_time" property="updateTime" />
                <result column="type" property="type" />
+                <result column="is_edit_weight" property="isEditWeight" />
    </resultMap>
    <sql id="Base_Column_List">
@@ -20,7 +21,8 @@
                weight,
                create_time,
                update_time,
-                type
+                type,
+                is_edit_weight
    </sql>
    <sql id="Base_Column_List_Alias">
@@ -30,7 +32,8 @@
                weight JxglAppraisalIndicators_weight,
                create_time JxglAppraisalIndicators_create_time,
                update_time JxglAppraisalIndicators_update_time,
-                type JxglAppraisalIndicators_type
+                type JxglAppraisalIndicators_type,
+                is_edit_weight JxglAppraisalIndicators_is_edit_weight
    </sql>
 	<!-- 
@@ -54,7 +57,10 @@
                        update_time,
                        </if>
                        <if test ='null != type'>
-                        type
+                        type,
+                        </if>
+                        <if test ='null != isEditWeight'>
+                        is_edit_weight
                        </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -74,7 +80,10 @@
                        #{updateTime},
                        </if>
                        <if test ='null != type'>
-                        #{type}
+                        #{type},
+                        </if>
+                        <if test ='null != isEditWeight'>
+                        #{isEditWeight}
                        </if>
        </trim>
    </insert>
@@ -92,7 +101,8 @@
                    <if test ='null != weight'>weight = #{weight},</if>
                    <if test ='null != createTime'>create_time = #{createTime},</if>
                    <if test ='null != updateTime'>update_time = #{updateTime},</if>
-                    <if test ='null != type'>type = #{type}</if>
+                    <if test ='null != type'>type = #{type},</if>
+                    <if test ='null != isEditWeight'>is_edit_weight = #{isEditWeight}</if>
        </set>
        WHERE id = #{id}
    </update>

--- a/src/main/resources/mapping/jxgl/JxglAppraisalIndicatorsTMapper.xml
+++ b/src/main/resources/mapping/jxgl/JxglAppraisalIndicatorsTMapper.xml
@@ -11,6 +11,7 @@
                <result column="create_time" property="createTime" />
                <result column="update_time" property="updateTime" />
                <result column="type" property="type" />
+                <result column="is_edit_weight" property="isEditWeight" />
    </resultMap>
    <sql id="Base_Column_List">
@@ -20,7 +21,8 @@
                weight,
                create_time,
                update_time,
-                type
+                type,
+                is_edit_weight
    </sql>
    <sql id="Base_Column_List_Alias">
@@ -30,7 +32,8 @@
                weight JxglAppraisalIndicatorsT_weight,
                create_time JxglAppraisalIndicatorsT_create_time,
                update_time JxglAppraisalIndicatorsT_update_time,
-                type JxglAppraisalIndicatorsT_type
+                type JxglAppraisalIndicatorsT_type,
+                is_edit_weight JxglAppraisalIndicatorsT_is_edit_weight
    </sql>
 	<!-- 
@@ -54,7 +57,10 @@
                        update_time,
                        </if>
                        <if test ='null != type'>
-                        type
+                        type,
+                        </if>
+                        <if test ='null != isEditWeight'>
+                        is_edit_weight
                        </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -74,7 +80,10 @@
                        #{updateTime},
                        </if>
                        <if test ='null != type'>
-                        #{type}
+                        #{type},
+                        </if>
+                        <if test ='null != isEditWeight'>
+                        #{isEditWeight}
                        </if>
        </trim>
    </insert>
@@ -92,7 +101,8 @@
                    <if test ='null != weight'>weight = #{weight},</if>
                    <if test ='null != createTime'>create_time = #{createTime},</if>
                    <if test ='null != updateTime'>update_time = #{updateTime},</if>
-                    <if test ='null != type'>type = #{type}</if>
+                    <if test ='null != type'>type = #{type},</if>
+                    <if test ='null != isEditWeight'>is_edit_weight = #{isEditWeight}</if>
        </set>
        WHERE id = #{id}
    </update>

--- a/src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
+++ b/src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
@@ -26,6 +26,8 @@
                <result column="sts" property="sts" />
                <result column="is_edit" property="isEdit" />
                <result column="executor_name" property="executorName" />
+                <result column="phone" property="phone" />
+                <result column="bm_name" property="bmName" />
    </resultMap>
    <resultMap id="BaseResultMap_All" type="cn.timer.api.bean.jxgl.JxglAppraisal" >
@@ -76,6 +78,7 @@
                <result column="create_time" property="createTime" />
                <result column="update_time" property="updateTime" />
                <result column="type" property="type" />
+                <result column="is_edit_weight" property="isEditWeight" />
                <collection column="JxglAppraisalIndicatorsAssessment_id" property="appraisalIndicatorsAssessments" ofType="cn.timer.api.bean.jxgl.JxglAppraisalIndicatorsAssessment" 
 	                resultMap="cn.timer.api.dao.jxgl.JxglAppraisalIndicatorsAssessmentMapper.BaseResultMap" columnPrefix="JxglAppraisalIndicatorsAssessment_">
 			    </collection>
@@ -178,7 +181,8 @@
                e.weight e_weight,
                e.create_time e_create_time,
                e.update_time e_update_time,
-                e.type e_type
+                e.type e_type,
+                e.is_edit_weight e_is_edit_weight
    </sql>
     <sql id="Base_Column_List_Alias_f">
@@ -332,7 +336,7 @@
        LEFT JOIN jxgl_performance_appraisal h ON a.performance_appraisal_id = h.id
        LEFT JOIN yggl_main_emp i ON b.executor_id = i.emp_num AND i.org_code = #{orgCode}
        WHERE a.id = #{id}
-        ORDER BY c.id , d.id
+        ORDER BY c.id , d.id , b.process_type
    </select>
 	<!-- 

--- a/src/main/resources/mapping/jxgl/JxglAppraisalTMapper.xml
+++ b/src/main/resources/mapping/jxgl/JxglAppraisalTMapper.xml
@@ -23,6 +23,7 @@
                <result column="create_time" property="createTime" />
                <result column="update_time" property="updateTime" />
                <result column="type" property="type" />
+                <result column="is_edit_weight" property="isEditWeight" />
                <collection column="JxglAppraisalItemT_id" property="appraisalItemTs" ofType="cn.timer.api.bean.jxgl.JxglAppraisalItemT" 
 	                resultMap="cn.timer.api.dao.jxgl.JxglAppraisalItemTMapper.BaseResultMap" columnPrefix="JxglAppraisalItemT_">
 			    </collection>
@@ -86,7 +87,8 @@
                b.weight JxglAppraisalIndicatorsT_weight,
                b.create_time JxglAppraisalIndicatorsT_create_time,
                b.update_time JxglAppraisalIndicatorsT_update_time,
-                b.type JxglAppraisalIndicatorsT_type
+                b.type JxglAppraisalIndicatorsT_type,
+                b.is_edit_weight JxglAppraisalIndicatorsT_is_edit_weight
    </sql>
    <sql id="Base_Column_List_Alias_c">
@@ -108,10 +110,7 @@
        WHERE a.id = #{id}
    </select>
 	<!-- 
    <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.jxgl.JxglAppraisalT">
        INSERT INTO jxgl_appraisal_t
        <trim prefix="(" suffix=")" suffixOverrides=",">

--- a/src/main/resources/mapping/jxgl/JxglBasicSettingMapper.xml
+++ b/src/main/resources/mapping/jxgl/JxglBasicSettingMapper.xml
@@ -62,6 +62,7 @@
 	        FROM jxgl_basic_setting a
 	        LEFT JOIN jxgl_performance_rating b ON a.id = b.basic_setting_id
 	        WHERE a.org_code = #{orgCode}
+	        ORDER BY b.ranks
 	    </select>
 	<!-- 

--- a/src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
+++ b/src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
@@ -200,17 +200,19 @@
    <select id="selectMyByQuery" resultMap="BaseResultMap_ALl" >
        SELECT 
        	a.name,a.appraisal_start_time,a.appraisal_end_time,
-        	b.sts b_sts,
+        	b.id b_id,b.sts b_sts,
-        	(SELECT name FROM yggl_main_emp WHERE emp_num = d.executor_id AND org_code = a.org_code) as b_executor_name,
        	c.comprehensive_score c_comprehensive_score,
-        	c.level c_level
+        	c.level c_level,
+        	e.name b_executor_name, e.phone b_phone,
+        	(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = e.bmgw_id limit 1) limit 1) as b_bm_name
 		FROM jxgl_performance_appraisal a
 		LEFT JOIN jxgl_appraisal b ON b.performance_appraisal_id = a.id
 		LEFT JOIN jxgl_appraisal_assessment c ON b.id = c.appraisal_id AND c.type = 1 
 		LEFT JOIN jxgl_process_node d ON b.id = d.appraisal_id AND d.sts = 1
+		LEFT JOIN yggl_main_emp e ON b.emp_num = e.emp_num AND a.org_code = e.org_code
 		<where>
 			AND a.org_code = #{param.orgCode} 
-			AND b.emp_num = #{param.id} 
+			AND d.executor_id = #{param.id} 
 			<if test="param.sts != null and param.sts == 0">
 				AND b.sts = 0
 			</if>
@@ -223,10 +225,8 @@
 			<if test="param.sts != null and param.sts == 3">
 				AND b.sts = 4
 			</if>
 		</where>
    </select>

--- a/src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml
+++ b/src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml
@@ -448,8 +448,8 @@
  </select>
  <select id="selectByPrimaryByempNum" resultMap="YgglEmpInfoMap" parameterType="java.lang.Integer" >
-    select * from yggl_main_emp
+    select * from yggl_main_emp emp
-    where emp_num = #{empNum,jdbcType=VARCHAR}
+    where emp.emp_num = #{empNum,jdbcType=VARCHAR} and emp.org_code = #{orgCode,jdbcType=INTEGER}
  </select>

--- a/src/main/resources/mapping/kqgl/PunchRecordMapper.xml
+++ b/src/main/resources/mapping/kqgl/PunchRecordMapper.xml
@@ -23,6 +23,7 @@
    <result column="remarks" property="remarks" jdbcType="VARCHAR" />
    <result column="punchmode" property="punchmode" jdbcType="INTEGER" />
    <result column="punchequipment" property="punchequipment" jdbcType="VARCHAR" />
+    <result column="commentary" property="commentary" />
    <result column="username" property="username" jdbcType="VARCHAR" />
    <result column="dept" property="dept" jdbcType="VARCHAR" />

--- a/src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
+++ b/src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
@@ -25,6 +25,7 @@
                <result column="remarks" property="remarks" />
                <result column="punchmode" property="punchmode" />
                <result column="punchequipment" property="punchequipment" />
+                <result column="commentary" property="commentary" />
    </resultMap>
    <sql id="Base_Column_List">
@@ -48,7 +49,8 @@
                bcid,
                remarks,
                punchmode,
-                punchequipment
+                punchequipment,
+                commentary
    </sql>
    <sql id="Base_Column_List_Alias">
@@ -72,7 +74,8 @@
                bcid KqglAssoDkjl_bcid,
                remarks KqglAssoDkjl_remarks,
                punchmode KqglAssoDkjl_punchmode,
-                punchequipment KqglAssoDkjl_punchequipment
+                punchequipment KqglAssoDkjl_punchequipment,
+                commentary KqglAssoDkjl_explain
    </sql>
 	<!-- 
@@ -138,7 +141,10 @@
                        punchmode,
                        </if>
                        <if test ='null != punchequipment'>
-                        punchequipment
+                        punchequipment,
+                        </if>
+                        <if test ='null != commentary'>
+                        commentary
                        </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -200,7 +206,10 @@
                        #{punchmode},
                        </if>
                        <if test ='null != punchequipment'>
-                        #{punchequipment}
+                        #{punchequipment},
+                        </if>
+                        <if test ='null != commentary'>
+                        #{commentary}
                        </if>
        </trim>
    </insert>
@@ -232,7 +241,8 @@
                    <if test ='null != bcid'>bcid = #{bcid},</if>
                    <if test ='null != remarks'>remarks = #{remarks},</if>
                    <if test ='null != punchmode'>punchmode = #{punchmode},</if>
-                    <if test ='null != punchequipment'>punchequipment = #{punchequipment}</if>
+                    <if test ='null != punchequipment'>punchequipment = #{punchequipment},</if>
+                    <if test ='null != commentary'>commentary = #{commentary}</if>
        </set>
        WHERE id = #{id}
    </update>

--- a/src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
+++ b/src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
@@ -167,6 +167,7 @@
                 <result column="bcxbdk3" property="bcxbdk3" />
                <result column="attname" property="attname" />
+                <result column="attpbfs" property="attpbfs" />
                <result column="attdate" property="attdate" />
                <result column="userid" property="userid" />
                <result column="data" property="data" />
@@ -249,7 +250,8 @@
 	<select id="Dailydetails" resultMap="DailyDetailsMap">
 					select sum.`name`,sum.num,sum.dept,sum.post,
-					(select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group) as attname,
+					IFNULL((select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') as attname,
+					IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') as attpbfs,
 					'' address,
 					'' remarks,
 					'' cardtype,
@@ -296,8 +298,8 @@
 					sum.working_transfer_overtime as workingtransferovertime,
 					sum.rest_transfer_overtime as resttransferovertime,
 					sum.holiday_transfer_overtime as holidaytransferovertime,
-					mrtj.leaverulesid,
+					IFNULL(mrtj.leaverulesid,'') as leaverulesid,
-					mrtj.duration as balancedays
+					IFNULL(mrtj.duration,'') as balancedays
 			from kqgl_asso_month_punch_summary sum
 			LEFT JOIN (
 				select DISTINCT info.`name` as username , 

--- a/src/main/resources/mapping/sbgjj/SbgjjAdminCbryMapper.xml
+++ b/src/main/resources/mapping/sbgjj/SbgjjAdminCbryMapper.xml
@@ -149,6 +149,7 @@
 <select id="EmployeeListByorgCode" resultMap="YgglEmpInfoMap">
     select * from yggl_main_emp
 		    where org_code = #{orgCode,jdbcType=VARCHAR}
+		    and job_status = 1
 		and emp_num not in (select cbry.user_num from sbgjj_admin_cbry cbry where cbry.qyid = #{orgCode,jdbcType=VARCHAR})
  </select>
@@ -185,6 +186,38 @@
    </if>
 </select>
+<select id="InsuredEmployees" resultMap="InsuredPersonnelMap">
+		select emp.emp_num as empnum,
+			 emp.`name` as empname,
+			 emp.phone as emphone,
+			 emp.zj_num as emzjnum,
+			 cbry.id as cbryid,
+			 cbry.cbfacs as cbfacs,
+			 csbh.id as csid,
+			 bmgw.dept,
+			 bmgw.post,
+			cbry.sbcb_state as sbcbstate,
+			cbry.gjjcb_state as gjjcbstate,
+			cbry.jl_mode as jlmode,
+			cbry.sbfaid as sbfaid,
+			cbry.sbjl_statime as sbjlstatime,
+			cbry.sbjljs as sbjljs,
+			cbry.gjjfaid as gjjfaid,
+			cbry.gjjjl_statime as gjjjlstatime,
+			cbry.gjjjljs as gjjjljs
+			from yggl_main_emp emp 
+	LEFT JOIN sbgjj_admin_cbry as cbry on cbry.user_num = emp.emp_num and cbry.state = 1
+	LEFT JOIN (select m.name as post,um.name as dept,m.id as mid
+				 from zzgl_bmgw_m m 
+				 left join zzgl_bmgw_m um on um.id = m.up_id  
+			) as bmgw on bmgw.mid = emp.bmgw_id
+	LEFT JOIN sbgjj_yj_csbh as csbh on csbh.city_name = cbry.cbfacs
+	where emp.org_code = #{param.orgcode}
+	<if test="param.title != null" >
+    	and (emp.`name` like CONCAT('%',#{param.title},'%') or emp.emp_num = #{param.title})
+    </if>
+</select>
    <insert id="insertsbgjjadmincbry" parameterType="cn.timer.api.bean.sbgjj.SbgjjAdminCbry" useGeneratedKeys="true" keyProperty="id">
        INSERT INTO sbgjj_admin_cbry

--- a/src/main/resources/mapping/sbgjj/SbgjjAssoDetailedMapper.xml
+++ b/src/main/resources/mapping/sbgjj/SbgjjAssoDetailedMapper.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.sbgjj.SbgjjAssoDetailedMapper">
+    <resultMap id="BaseResultMap" type="cn.timer.api.bean.sbgjj.SbgjjAssoDetailed" >
+                <id column="id" property="id" />
+                <result column="user_id" property="userId" />
+                <result column="attribution_time" property="attributionTime" />
+                <result column="cbfzmx_id" property="cbfzmxId" />
+                <result column="coverage_name" property="coverageName" />
+                <result column="personal_amount" property="personalAmount" />
+                <result column="company_amount" property="companyAmount" />
+                <result column="xz_type" property="xzType" />
+                <result column="org_code" property="orgCode" />
+                <result column="addtime" property="addtime" />
+    </resultMap>
+    <sql id="Base_Column_List">
+                id,
+                user_id,
+                attribution_time,
+                cbfzmx_id,
+                coverage_name,
+                personal_amount,
+                company_amount,
+                xz_type,
+                org_code,
+                addtime
+    </sql>
+    <sql id="Base_Column_List_Alias">
+                id SbgjjAssoDetailed_id,
+                user_id SbgjjAssoDetailed_user_id,
+                attribution_time SbgjjAssoDetailed_attribution_time,
+                cbfzmx_id SbgjjAssoDetailed_cbfzmx_id,
+                coverage_name SbgjjAssoDetailed_coverage_name,
+                personal_amount SbgjjAssoDetailed_personal_amount,
+                company_amount SbgjjAssoDetailed_company_amount,
+                xz_type SbgjjAssoDetailed_xz_type,
+                org_code SbgjjAssoDetailed_org_code,
+                addtime SbgjjAssoDetailed_addtime
+    </sql>
+	<insert id="insertsbgjjassodetailedList" parameterType="java.util.List" >
+	    insert into sbgjj_asso_detailed (user_id,attribution_time,cbfzmx_id,coverage_name,personal_amount,company_amount,xz_type,org_code,addtime)
+	    <foreach collection="list" item="item" index="index" open="values " close="" separator=",">
+	   	(
+	      <if test="item.userId != null" >
+	        #{item.userId},
+	      </if>
+	      <if test="item.attributionTime != null" >
+	        #{item.attributionTime},
+	      </if>
+	      <if test="item.cbfzmxId != null" >
+	        #{item.cbfzmxId},
+	      </if>
+	      <if test="item.coverageName != null" >
+	        #{item.coverageName},
+	      </if>
+	      <if test="item.personalAmount != null" >
+	        #{item.personalAmount},
+	      </if>
+	      <if test="item.companyAmount != null" >
+	        #{item.companyAmount},
+	      </if>
+	      <if test="item.xzType != null" >
+	        #{item.xzType},
+	      </if>
+	      <if test="item.orgCode != null" >
+	        #{item.orgCode},
+	      </if>
+	      <if test="item.addtime != null" >
+	        #{item.addtime}
+	      </if>
+	      )
+	    </foreach>
+   </insert>
+	<!-- 
+    <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.sbgjj.SbgjjAssoDetailed">
+        INSERT INTO sbgjj_asso_detailed
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                        <if test ='null != userId'>
+                        user_id,
+                        </if>
+                        <if test ='null != attributionTime'>
+                        attribution_time,
+                        </if>
+                        <if test ='null != cbfzmxId'>
+                        cbfzmx_id,
+                        </if>
+                        <if test ='null != coverageName'>
+                        coverage_name,
+                        </if>
+                        <if test ='null != personalAmount'>
+                        personal_amount,
+                        </if>
+                        <if test ='null != companyAmount'>
+                        company_amount,
+                        </if>
+                        <if test ='null != xzType'>
+                        xz_type,
+                        </if>
+                        <if test ='null != orgCode'>
+                        org_code,
+                        </if>
+                        <if test ='null != addtime'>
+                        addtime
+                        </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                        <if test ='null != userId'>
+                        #{userId},
+                        </if>
+                        <if test ='null != attributionTime'>
+                        #{attributionTime},
+                        </if>
+                        <if test ='null != cbfzmxId'>
+                        #{cbfzmxId},
+                        </if>
+                        <if test ='null != coverageName'>
+                        #{coverageName},
+                        </if>
+                        <if test ='null != personalAmount'>
+                        #{personalAmount},
+                        </if>
+                        <if test ='null != companyAmount'>
+                        #{companyAmount},
+                        </if>
+                        <if test ='null != xzType'>
+                        #{xzType},
+                        </if>
+                        <if test ='null != orgCode'>
+                        #{orgCode},
+                        </if>
+                        <if test ='null != addtime'>
+                        #{addtime}
+                        </if>
+        </trim>
+    </insert>
+    <delete id="delete" >
+        DELETE FROM sbgjj_asso_detailed
+        WHERE id = #{id}
+    </delete>
+    <update id="update" parameterType="cn.timer.api.bean.sbgjj.SbgjjAssoDetailed">
+        UPDATE sbgjj_asso_detailed
+        <set>
+                    <if test ='null != userId'>user_id = #{userId},</if>
+                    <if test ='null != attributionTime'>attribution_time = #{attributionTime},</if>
+                    <if test ='null != cbfzmxId'>cbfzmx_id = #{cbfzmxId},</if>
+                    <if test ='null != coverageName'>coverage_name = #{coverageName},</if>
+                    <if test ='null != personalAmount'>personal_amount = #{personalAmount},</if>
+                    <if test ='null != companyAmount'>company_amount = #{companyAmount},</if>
+                    <if test ='null != xzType'>xz_type = #{xzType},</if>
+                    <if test ='null != orgCode'>org_code = #{orgCode},</if>
+                    <if test ='null != addtime'>addtime = #{addtime}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+    <select id="load" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM sbgjj_asso_detailed
+        WHERE id = #{id}
+    </select>
+    <select id="pageList" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM sbgjj_asso_detailed
+        LIMIT #{offset}, #{pageSize}
+    </select>
+    <select id="pageListCount" resultType="java.lang.Integer">
+        SELECT count(1)
+        FROM sbgjj_asso_detailed
+    </select>
+	 -->
+</mapper>
\ No newline at end of file