财务代码提交

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -237,7 +237,7 @@ public class CwReimbursementInfoService {
     public CwReimbursementInfo save(SaveInfoDto dto) throws Exception{
         // 获取当前登录人信息
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        if (StringUtils.isNotEmpty(dto.getId())) {
+        if (StringUtils.isNotEmpty(dto.getId()) && !dto.getId().equals("false")) {
             return update(dto, userDTO);
         } else {
             return add(dto, userDTO);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalType/mapper/xml/CwReimbursementTypeMapper.xml

@@ -3,10 +3,10 @@
 <mapper namespace="com.jeeplus.finance.reimbursementApproval.approvalType.mapper.CwReimbursementTypeMapper">
 	<resultMap id="BaseResultMap" type="com.jeeplus.finance.reimbursementApproval.approvalType.domain.CwReimbursementTypeInfo">
 		<id property="id" column="id" jdbcType="VARCHAR"/>
-		<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-		<result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
-		<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-		<result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
+		<result property="createBy" column="create_by_id" jdbcType="VARCHAR"/>
+		<result property="createDate" column="create_time" jdbcType="TIMESTAMP"/>
+		<result property="updateBy" column="update_by_id" jdbcType="VARCHAR"/>
+		<result property="updateDate" column="update_time" jdbcType="TIMESTAMP"/>
 		<result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
 
 		<result property="level" column="level" jdbcType="VARCHAR"/>
@@ -21,10 +21,10 @@
 
 	<sql id="Base_Column_List">
         a.id,
-        a.create_by,
-        a.create_date,
-        a.update_by,
-        a.update_date,
+        a.create_by_id,
+        a.create_time,
+        a.update_by_id,
+        a.update_time,
         a.del_flag,
         a.level,
 		a.name,
@@ -52,10 +52,10 @@
         so.useable as "useable",
         so.primary_person as "primaryPerson",
         so.deputy_person as "deputyPerson",
-		so.create_by as "createBy.id",
-		so.create_date as "createDate",
-		so.update_by as "updateBy.id",
-		so.update_date as "updateDate",
+		so.create_by_id as "createBy.id",
+		so.create_time as "createDate",
+		so.update_by_id as "updateBy.id",
+		so.update_time as "updateDate",
         so.remarks as "remarks",
         so.del_flag as "delFlag",
         so.is_public as "isPublic",
@@ -134,10 +134,10 @@
 			resultType="com.jeeplus.finance.reimbursementApproval.approvalType.domain.CwReimbursementTypeInfo">
 		SELECT
 			t.id,
-			t.create_date,
-			t.create_by,
-			t.update_date,
-			t.update_by,
+			t.create_time,
+			t.create_by_id,
+			t.update_time,
+			t.update_by_id,
 			t.del_flag,
 			t.LEVEL,
 			t.NAME,
@@ -148,10 +148,10 @@
 				(
 				SELECT
 					id,
-					create_date,
-					a.create_by,
-					a.update_date,
-					a.update_by,
+					create_time,
+					a.create_by_id,
+					a.update_time,
+					a.update_by_id,
 					a.del_flag,
 					a.LEVEL,
 					a.NAME,
@@ -175,10 +175,10 @@
 					union
 				SELECT
 					id,
-					create_date,
-					a.create_by,
-					a.update_date,
-					a.update_by,
+					create_time,
+					a.create_by_id,
+					a.update_time,
+					a.update_by_id,
 					a.del_flag,
 					a.LEVEL,
 					a.NAME,
@@ -193,10 +193,10 @@
 				union
 				SELECT
 					id,
-					create_date,
-					a.create_by,
-					a.update_date,
-					a.update_by,
+					create_time,
+					a.create_by_id,
+					a.update_time,
+					a.update_by_id,
 					a.del_flag,
 					a.LEVEL,
 					a.NAME,
@@ -219,10 +219,10 @@
 				UNION
 				SELECT
 					id,
-					create_date,
-					a.create_by,
-					a.update_date,
-					a.update_by,
+					create_time,
+					a.create_by_id,
+					a.update_time,
+					a.update_by_id,
 					a.del_flag,
 					a.LEVEL,
 					a.NAME,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalType/service/CwReimbursementTypeService.java

@@ -111,6 +111,7 @@ public class CwReimbursementTypeService {
             for (int i=0;i<officeDomains.size()-1;i++){
                 //当get(i)的父级id与 i+1的id相同，并且i+的部门层级为1的时候
                 if (officeDomains.get(i).getParentId().equals(officeDomains.get(i+1).getId()) &&
+                        StringUtils.isNotEmpty(officeDomains.get(i+1).getGrade()) &&
                         officeDomains.get(i+1).getGrade().equals("1")){
                     info.setOfficeId(officeDomains.get(i).getId());
                 }

jeeplus-modules/jeeplus-wps/target/generated-sources/annotations/com/jeeplus/office/service/mapstruct/DocCategoryWrapperImpl.java

@@ -15,8 +15,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-05-23T15:43:41+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
+    date = "2023-06-16T08:58:29+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
 )
 @Component
 public class DocCategoryWrapperImpl implements DocCategoryWrapper {
@@ -187,6 +187,9 @@ public class DocCategoryWrapperImpl implements DocCategoryWrapper {
 
         DocCategoryDTO docCategoryDTO = new DocCategoryDTO();
 
+        docCategoryDTO.setTaskId( arg0.getTaskId() );
+        docCategoryDTO.setProcInsId( arg0.getProcInsId() );
+        docCategoryDTO.setProcessDefinitionId( arg0.getProcessDefinitionId() );
         docCategoryDTO.setId( arg0.getId() );
         docCategoryDTO.setCreateTime( arg0.getCreateTime() );
         docCategoryDTO.setCreateBy( arg0.getCreateBy() );

jeeplus-modules/jeeplus-wps/target/generated-sources/annotations/com/jeeplus/office/service/mapstruct/DocTemplateWrapperImpl.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-05-23T15:43:41+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
+    date = "2023-06-16T08:58:29+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
 )
 @Component
 public class DocTemplateWrapperImpl implements DocTemplateWrapper {