提交

src/main/java/cn/timer/api/dao/xcgl/XcglAssoJsgzzxMapper.java

@@ -29,4 +29,6 @@ public interface XcglAssoJsgzzxMapper extends BaseMapper<XcglAssoJsgzzx> {
 	List<CalculationOptionsDto> selectCalculationOptionsList(int xzzid,int userid);
 	List<CalculationOptionsDto> selectCalculationOptionsList(int xzzid,int userid);
 	
 	
 	List<XcglAssoJsgzzx> selectSalarySectionList(int xzzid);
 	List<XcglAssoJsgzzx> selectSalarySectionList(int xzzid);
+	
+	List<XcglAssoJsgzzx> SalaryRuleGroupItem(int xzzid);
 }
 }

src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzbMapper.java

@@ -38,6 +38,8 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
 	void updateBatchXzxjg(List<XcglAssoXzb> list);
 	void updateBatchXzxjg(List<XcglAssoXzb> list);
 	
 	
 	
 	
+	HolidayInquiryDto HolidayamountNum(int orgcode,String apptime,int rules_type,int userid);
+	
 	HolidayInquiryDto Holidayamount(int orgcode,String apptime,int rules_type,int userid);
 	HolidayInquiryDto Holidayamount(int orgcode,String apptime,int rules_type,int userid);
 	
 	
 	HolidayInquiryDto NumberOvertime(int orgcode,String apptime,int userid);
 	HolidayInquiryDto NumberOvertime(int orgcode,String apptime,int userid);

src/main/resources/application-dev.yml

@@ -194,6 +194,7 @@ config-8timer:
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   authentication-code: '888888'
   authentication-code: '888888'
+  prescription: 8 #一天工作8小时
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100 #默认最大公司数量
   register-company-max-num: 100 #默认最大公司数量
   register-childAccount-max-num: 10 #默认最大子账号数量
   register-childAccount-max-num: 10 #默认最大子账号数量

src/main/resources/application-pro.yml

@@ -169,6 +169,7 @@ config-8timer:
   machine8timerUrl: 'http://record.8timer.cn'
   machine8timerUrl: 'http://record.8timer.cn'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   authentication-code: ''
   authentication-code: ''
+  prescription: 8 #一天工作8小时
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100
   register-company-max-num: 100
   register-childAccount-max-num: 10
   register-childAccount-max-num: 10

src/main/resources/application-test.yml

@@ -168,6 +168,7 @@ config-8timer:
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   authentication-code: '888888'
   authentication-code: '888888'
+  prescription: 8 #一天工作8小时
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100
   register-company-max-num: 100
   register-childAccount-max-num: 10
   register-childAccount-max-num: 10

src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml

@@ -45,6 +45,13 @@
 		   		<result column="rsz" property="rsz"/>
 		   		<result column="rsz" property="rsz"/>
     </resultMap>
     </resultMap>
     
     
+    <select id="SalaryRuleGroupItem" resultMap="BaseResultMap">
+    	select * from xcgl_asso_jsgzzx js
+		where js.xzzid = #{xzzid}
+		ORDER BY js.rulestate = 2 or js.rulestate = 3 ASC,
+		js.id ASC
+    </select>
+    
     <select id="selectSalarySectionList" resultMap="BaseResultMap">
     <select id="selectSalarySectionList" resultMap="BaseResultMap">
     		select jsgzzx.* from xcgl_asso_jsgzzx jsgzzx
     		select jsgzzx.* from xcgl_asso_jsgzzx jsgzzx
 				LEFT JOIN xcgl_asso_option as opt on opt.id = jsgzzx.optionid
 				LEFT JOIN xcgl_asso_option as opt on opt.id = jsgzzx.optionid

src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml

@@ -94,6 +94,17 @@
 			where aa.orgcode = #{orgcode}
 			where aa.orgcode = #{orgcode}
     </select>
     </select>
     
     
+    <select id="HolidayamountNum" resultMap="HolidayInquiryDtoMap">
+    	select COUNT(*) as num
+	    	from kqgl_asso_relation_summary su 
+			where su.approval_type = 2
+			and su.org_code = #{orgcode}
+			and su.ordernum = 1
+			and SUBSTR(su.app_time,1,7) = #{apptime}
+			and su.leave_type_id = (select ru.id from kqgl_asso_leave_rules ru where ru.org_code = #{orgcode} and ru.rules_type = #{rules_type})
+			and su.user_id = #{userid}
+    </select>
+    
     <select id="Holidayamount" resultMap="HolidayInquiryDtoMap">
     <select id="Holidayamount" resultMap="HolidayInquiryDtoMap">
 	    select IFNULL(SUM(su.duration),0) as balance
 	    select IFNULL(SUM(su.duration),0) as balance
 	    	from kqgl_asso_relation_summary su 
 	    	from kqgl_asso_relation_summary su