Browse Source

来一波

zhouli 9 months ago
parent
commit
261a3fecc3

+ 2 - 2
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/Subject.java

@@ -47,13 +47,13 @@
      private String accSubject;
      private String accSubject;
 
 
 	 @Schema(description = "是否为高新研发费用科目,1:是,0,否")
 	 @Schema(description = "是否为高新研发费用科目,1:是,0,否")
-	 private int isRdSubject;
+	 private int rdSubjectEnable;
 
 
 	 @Schema(description = "高新研发费用科目")
 	 @Schema(description = "高新研发费用科目")
 	 private String rdSubject;
 	 private String rdSubject;
 
 
 	 @Schema(description = "是否为加计扣除研发费用科目,1:是,0,否")
 	 @Schema(description = "是否为加计扣除研发费用科目,1:是,0,否")
-	 private int isAdSubject;
+	 private int adSubjectEnable;
 
 
 	 @Schema(description = "加计扣除研发费用科目")
 	 @Schema(description = "加计扣除研发费用科目")
 	 private String adSubject;
 	 private String adSubject;

+ 2 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/SubjectMapper.xml

@@ -9,9 +9,9 @@
         <result column="code" property="code"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="name" property="name"/>
         <result column="acc_subject" property="accSubject"/>
         <result column="acc_subject" property="accSubject"/>
-        <result column="is_rd_subject" property="is_rd_subject"/>
+        <result column="rd_subject_enable" property="rdSubjectEnable"/>
         <result column="rd_subject" property="rdSubject"/>
         <result column="rd_subject" property="rdSubject"/>
-        <result column="is_ad_subject" property="is_ad_subject"/>
+        <result column="ad_subject_enable" property="adSubjectEnable"/>
         <result column="ad_subject" property="adSubject"/>
         <result column="ad_subject" property="adSubject"/>
     </resultMap>
     </resultMap>
 
 

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/AttendanceServiceImpl.java

@@ -204,6 +204,6 @@ public class AttendanceServiceImpl extends BaseServiceImpl<AttendanceMapper, Att
 		for (AttendanceDto entity : attendanceList) {
 		for (AttendanceDto entity : attendanceList) {
 			affectNum += baseMapper.clearUnicodeAndMonthly(entity.getUnicode(), entity.getYearAndMonth());
 			affectNum += baseMapper.clearUnicodeAndMonthly(entity.getUnicode(), entity.getYearAndMonth());
 		}
 		}
-		return affectNum > 0;
+		return affectNum >= 0;
 	}
 	}
 }
 }

+ 4 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/SalaryServiceImpl.java

@@ -201,7 +201,10 @@ public class SalaryServiceImpl extends BaseServiceImpl<SalaryMapper, SalaryEntit
 			salary.setYearAndMonth(yearAndMonth);
 			salary.setYearAndMonth(yearAndMonth);
 			insertList.add(salary);
 			insertList.add(salary);
 		}
 		}
-		return this.saveBatch(insertList);
+		if (CollectionUtil.isNotEmpty(unicodeList)) {
+			return this.saveBatch(insertList);
+		}
+		return true;
 	}
 	}
 
 
 	@Transactional
 	@Transactional