Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!496

src/main/java/cn/timer/api/bean/kqgl/AttendanceAssistant.java

@@ -52,4 +52,6 @@ public class AttendanceAssistant implements Serializable{
 	int overtimeRulesId;//加班id
 	
 	int fieldpersonnel;//外勤
+	
+	int restdayclock;//休息日打卡
 }

src/main/java/cn/timer/api/bean/kqgl/AttendanceGroup.java

@@ -46,6 +46,8 @@ public class AttendanceGroup implements Serializable{
 	private Integer overtimeRulesId;//加班规则id
 	private String overtimeRulesName;//加班规则名称
 	
+	private Integer restdayclock;//休息日打卡
+	
 	private Integer kqjid;
 
 	private List<AttGroupBinPunchMode> kqzdkfslist = new ArrayList<AttGroupBinPunchMode>();

src/main/java/cn/timer/api/bean/kqmk/KqglMainKqz.java

@@ -97,4 +97,7 @@ public class KqglMainKqz extends Model<KqglMainKqz> {
 	@ApiModelProperty(value="加班规则 加班规则",example="101")
     private Integer overtimeRulesId;
 	
+	@ApiModelProperty(value="休息日打卡开关 0:关 1：开",example="101")
+    private Integer restdayclock;
+
 }
\ No newline at end of file

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

@@ -50,6 +50,7 @@ import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.enums.SysRoleType;
+import cn.timer.api.controller.kqgl.ClockInTool;
 import cn.timer.api.dao.crm.CrmClientContactsMapper;
 import cn.timer.api.dao.crm.CrmClientDataMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
@@ -610,7 +611,7 @@ public class CrmController {
 			crmClientDatas = CheckUtil.distinct(myClient, myAsso, true).stream()
 					.filter(CheckUtil.distinctByKey(CrmClientData::getId)).collect(Collectors.toList());
 		} else if (type == 1) // 我负责的客户
-			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,type);
+			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,typei);
 		else if (type == 2) // 我协作的客户
 			crmClientDatas = getMyAssociateCilent(empNum, orgCode, groupId, status, like,typei,startFollowTime,endFollowTime,startCreateTime,endCreateTime);
 		else if (type == 3) // 我关注的客户
@@ -634,15 +635,22 @@ public class CrmController {
 			BeanUtil.copyProperties(crmd, crmdts , "iscooperation");
 			List<CrmClientAssociate> crmClientAssociates = CrmClientAssociate.builder().build()
 					.selectList(new QueryWrapper<CrmClientAssociate>().lambda().eq(CrmClientAssociate::getCid, crmd.getId()));
+			int u = 0;
 			if(crmClientAssociates.size() > 0) {
+				String[] collaborator = new String[crmClientAssociates.size()];
+				
 				for (CrmClientAssociate crmClientAssociate : crmClientAssociates) {
 					Integer empNum1 = crmClientAssociate.getAssociateId();
-					if(userBean.getEmpNum().equals(empNum1)) {
+					collaborator[u] = String.valueOf(empNum1);
+					u++;
+				}
+				
+				if(ClockInTool.contains(ClockInTool.deleteArrayNull(collaborator),String.valueOf(userBean.getEmpNum()))) {
 					crmdts.setIscooperation(1);
 				}else {
 					crmdts.setIscooperation(0);
 				}
-				}
+				
 			}else {
 				crmdts.setIscooperation(0);
 			}

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

@@ -1361,6 +1361,8 @@ public class AttController {
 			
 			attgro.setIsWq(attass.getFieldpersonnel());//外勤：0-关  1-开
 			
+			attgro.setRestdayclock(attass.getRestdayclock());//休息日打卡
+			
 			if(attass.getAtttype() == 1){
 				attgro.setIsFdjjr(attass.getLegalholidays());//是否开启法定节假日休息（固定排班）
 			}

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

@@ -1309,7 +1309,8 @@ public class TimeCardController {
 				.isWq(attass.getFieldpersonnel()).isFdjjr(attass.getLegalholidays()).isXzbcdk(attass.getOptscheduling()).sybc(String.join(",",attass.getAttShifts()))
 				.isDqtx(attass.getAttRemind()).txry(String.join(",",attass.getAttRemindUserids())).txfs(attass.getAdvanceDays()).txxhts(attass.getRemCycleDays())
 				.txsjTime(attass.getReminderTime()).tsfs(String.join(",",attass.getPromptingMode())).isWpbsdk(attass.getAttRemind()).kqkssjTime(attass.getNewAttTime())
-				.zsgzsc(attass.getLeastworkTime()).zcgzsc(attass.getNormalWorkTime()).jbzdsc(attass.getMaxOvertimeTime()).overtimeRulesId(attass.getOvertimeRulesId()).build();
+				.zsgzsc(attass.getLeastworkTime()).zcgzsc(attass.getNormalWorkTime()).jbzdsc(attass.getMaxOvertimeTime()).overtimeRulesId(attass.getOvertimeRulesId())
+				.restdayclock(attass.getRestdayclock()).build();
 		
 //		if (!attgro.insertOrUpdate()) 
 		if (!attgro.insert()) 

src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java

@@ -96,7 +96,7 @@ public class AttendanceTaskTiming{
 	//typeid:1-员工  2-考勤组
 
 //	@Scheduled(cron = "0 */5 * * * ?")
-//	@Scheduled(cron = "0 16 17 * * ?")
+//	@Scheduled(cron = "0 15 16 * * ?")
 	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
 	public void AttendanceTask() throws ParseException {
 

src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java

@@ -88,7 +88,7 @@ public class LastMonthtimingExport {
 	
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); 
 	
-//	@Scheduled(cron = "0 10 17 * * ?")
+//	@Scheduled(cron = "0 6 12 * * ?")
 	@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行
 	public void LastMonthtimingAttendanceTask() throws ParseException {
 		

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

@@ -795,7 +795,7 @@ public class SpmkController {
 			}
 			//我发起的
 			if(mySummaryQueryDto.getType() ==  0) {
-				mySummaryQueryDto.setSts(null);
+//				mySummaryQueryDto.setSts(null);
 			}
 			// 缺-部门id 搜索
 			IPage<SpmkApproveSummary> pageAs = spmkApproveSummaryMapper.selectPageByQueryForEmpNum(page, mySummaryQueryDto);

src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java

@@ -15,5 +15,5 @@ import cn.timer.api.bean.kqmk.KqglAssoDkjl;
  */
 @Repository
 public interface KqglAssoDkjlMapper extends BaseMapper<KqglAssoDkjl> {
-	List<KqglAssoDkjl> getDetailedRecordClock(Long start,Long end,Integer userId,String attdate);
+	List<KqglAssoDkjl> getDetailedRecordClock(Long start,Long end,Integer userId,String attdate,Integer qyid);
 }

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

@@ -54,4 +54,6 @@ public class AttendanceAssistantDto implements Serializable{
 	int overtimeRulesId;//加班id
 	
 	int fieldpersonnel;//外勤
+	
+	int restdayclock;//休息日打卡
 }

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

@@ -81,6 +81,9 @@ public class KqglMainKqzDto {
 	@ApiModelProperty(value="加班规则 加班规则",example="101")
     private Integer overtimeRulesId;
 	
+	@ApiModelProperty(value="休息日打卡开关 0:关 1：开",example="101")
+    private Integer restdayclock;
+
 	
 	@ApiModelProperty(value = "考勤组人员数", example = "100")
 	private Integer kqznum;

src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml

@@ -33,6 +33,8 @@
     
     <result column="overtimeRulesName" property="overtimeRulesName" />
     
+    <result column="restdayclock" property="restdayclock" />
+    
     <collection property="kqzdkfslist" ofType="cn.timer.api.bean.kqgl.AttGroupBinPunchMode">
    		<result column="kqzId" property="kqzId" jdbcType="INTEGER" />
    		<result column="type" property="type" jdbcType="INTEGER" />
@@ -95,7 +97,7 @@
   
   <sql id="Base_Column_List" >
     id, name, kqbz, pbfs, qyid, is_fdjjr, kqkssj_time, zsgzsc, zcgzsc, jbzdsc, is_dqtx, 
-    txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq,overtime_rules_id
+    txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq,overtime_rules_id,restdayclock
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select  kqz.*,
@@ -113,14 +115,14 @@
       kqkssj_time, zsgzsc, zcgzsc, 
       jbzdsc, is_dqtx, txry, 
       txfs, txxhts, txsj_time, 
-      tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq)
+      tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq,restdayclock)
     values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{kqbz,jdbcType=VARCHAR}, 
       #{pbfs,jdbcType=INTEGER}, #{qyid,jdbcType=INTEGER}, #{isFdjjr,jdbcType=INTEGER}, 
       #{kqkssjTime,jdbcType=VARCHAR}, #{zsgzsc,jdbcType=VARCHAR}, #{zcgzsc,jdbcType=VARCHAR}, 
       #{jbzdsc,jdbcType=VARCHAR}, #{isDqtx,jdbcType=INTEGER}, #{txry,jdbcType=VARCHAR}, 
       #{txfs,jdbcType=INTEGER}, #{txxhts,jdbcType=INTEGER}, #{txsjTime,jdbcType=VARCHAR}, 
       #{tsfs,jdbcType=VARCHAR}, #{isWpbsdk,jdbcType=INTEGER}, #{sybc,jdbcType=VARCHAR},
-      #{isXzbcdk,jdbcType=INTEGER},#{isWq,jdbcType=INTEGER})
+      #{isXzbcdk,jdbcType=INTEGER},#{isWq,jdbcType=INTEGER},#{restdayclock,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" useGeneratedKeys="true" keyProperty="id">
     insert into kqgl_main_kqz
@@ -186,6 +188,9 @@
       <if test="overtimeRulesId != null" >
         overtime_rules_id,
       </if>
+      <if test="restdayclock != null" >
+        restdayclock,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       
@@ -249,6 +254,9 @@
       <if test="overtimeRulesId != null" >
         #{overtimeRulesId,jdbcType=INTEGER},
       </if>
+      <if test="restdayclock != null" >
+        #{restdayclock,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" >
@@ -314,6 +322,9 @@
       <if test="overtimeRulesId != null" >
         overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER},
       </if>
+      <if test="restdayclock != null" >
+        restdayclock = #{restdayclock,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -338,7 +349,8 @@
       sybc = #{sybc,jdbcType=VARCHAR},
       is_xzbcdk = #{isXzbcdk,jdbcType=INTEGER},
       is_wq = #{isWq,jdbcType=INTEGER},
-      overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER}
+      overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER},
+      restdayclock = #{restdayclock,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

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

@@ -85,6 +85,7 @@
 		and dkjl.user_id = #{userId,jdbcType=INTEGER}
 		and dkjl.status not in (0,2) 
 		and dkjl.attdate = #{attdate}
+		and dkjl.qyid = #{qyid}
   	</select>
 	<!-- 
 

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

@@ -25,6 +25,7 @@
                 <result column="is_xzbcdk" property="isXzbcdk" />
                 <result column="is_wq" property="isWq" />
                 <result column="overtime_rules_id" property="overtimeRulesId" />
+                <result column="restdayclock" property="restdayclock" />
     </resultMap>
     
     <resultMap id="AuxiliaryMap" type="cn.timer.api.dto.kqmk.KqglMainKqzDto" >
@@ -82,7 +83,8 @@
                 sybc,
                 is_xzbcdk,
                 is_wq,
-                overtime_rules_id
+                overtime_rules_id,
+                restdayclock
     </sql>
     
     <sql id="Base_Column_List_Alias">
@@ -106,7 +108,8 @@
                 sybc KqglMainKqz_sybc,
                 is_xzbcdk KqglMainKqz_is_xzbcdk,
                 is_wq KqglMainKqz_is_wq,
-                overtime_rules_id KqglMainKqz_overtime_rules_id
+                overtime_rules_id KqglMainKqz_overtime_rules_id,
+                restdayclock KqglMainKqz_restdayclock
     </sql>
     
     <sql id="Base_Column_List_a">
@@ -130,7 +133,8 @@
                 a.sybc,
                 a.is_xzbcdk,
                 a.is_wq,
-                a.overtime_rules_id
+                a.overtime_rules_id,
+                a.restdayclock
     </sql>
     
     <select id="selectAttGroupMachineByQyid" resultMap="AuxiliaryMap">