From 05b36ba46a2b276c3e3e8af3d635402630b4d666 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 31 Mar 2022 10:58:14 +0800 Subject: [PATCH 1/8] =?UTF-8?q?update=20=E6=97=A5=E5=BF=97=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/jero-boot-single-startup/src/main/resources/logback-spring.xml b/jero-boot-single-startup/src/main/resources/logback-spring.xml index 79eced25..ab95f492 100644 --- a/jero-boot-single-startup/src/main/resources/logback-spring.xml +++ b/jero-boot-single-startup/src/main/resources/logback-spring.xml @@ -29,35 +29,35 @@ - - - - ERROR - - - - %p%d%msg%M%F{32}%L - - - ${LOG_HOME}/error-log.html - + + + + + + + + + + + + - - - - ${LOG_HOME}/jeroboot-%d{yyyy-MM-dd}.%i.html - - 30 - 10MB - - - - %p%d%msg%M%F{32}%L - - - + + + + + + + + + + + + + + From 6e022d30ea3c57f675b96fa4e855039e26681365 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 31 Mar 2022 11:03:43 +0800 Subject: [PATCH 2/8] =?UTF-8?q?update=20=E6=97=A5=E5=BF=97=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-single-startup/src/main/resources/logback-spring.xml b/jero-boot-single-startup/src/main/resources/logback-spring.xml index ab95f492..f5b34485 100644 --- a/jero-boot-single-startup/src/main/resources/logback-spring.xml +++ b/jero-boot-single-startup/src/main/resources/logback-spring.xml @@ -70,8 +70,8 @@ - - + + \ No newline at end of file From d71a5324ea4afdb18a7d7221e5757e487853fd46 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 6 Apr 2022 16:02:12 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix=20=E4=BC=81=E4=B8=9A=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=90=8E=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=9A=84=E8=BA=AB=E4=BB=BD=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/service/impl/PayCompanyManagementServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index f4a1df14..d4c46079 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -595,6 +595,10 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(PayContactsManagement::getRoleCode,PayContactsManagementCommon.ROLE_CODE1); + updateWrapper.eq(PayContactsManagement::getCompanyName,payCompanyManagement.getCompanyName()); + payContactsManagementService.update(updateWrapper); payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1); payContactsManagementService.addMeeting(payContactsManagement); } From 0bf00fd5891470f2acdb656a1c375e4873173971 Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Thu, 7 Apr 2022 15:30:50 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=A7=93=E5=90=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/service/impl/PayIncomeContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 08c595a9..d29e7a4a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -184,10 +184,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl Date: Thu, 7 Apr 2022 15:43:00 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=A7=93=E5=90=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/增量SQL/收入合同联系人名称显示错误修改.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 db/增量SQL/收入合同联系人名称显示错误修改.sql diff --git a/db/增量SQL/收入合同联系人名称显示错误修改.sql b/db/增量SQL/收入合同联系人名称显示错误修改.sql new file mode 100644 index 00000000..3227024a --- /dev/null +++ b/db/增量SQL/收入合同联系人名称显示错误修改.sql @@ -0,0 +1,4 @@ +update pay_mail_contract p set p.liaison_man = ( +select pcmt.name from pay_income_contract pic +left join pay_contacts_management_temporary pcmt on pic.signed_contacts_temporary_id = pcmt.id +where pic.id = p.contract_id) From 4b8a253623d94ba07a725e5440614c6b7b544dac Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Thu, 7 Apr 2022 15:48:52 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=A7=93=E5=90=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/service/impl/PayIncomeContractServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index d29e7a4a..228f649c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -949,10 +949,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); From 5cb764a569184d1b1206e8156ced82794a5de8f9 Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Thu, 7 Apr 2022 16:47:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PaySpendingContractServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index 2dee8b6e..ae4a825c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -18,7 +18,6 @@ import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PaySpendingContract; import com.jero.contract.entity.PaySpendingContractAudit; import com.jero.contract.entity.PaySpendingContractInstallment; @@ -28,11 +27,9 @@ import com.jero.contract.service.IPaySpendingContractInstallmentService; import com.jero.contract.service.IPaySpendingContractService; import com.jero.contract.vo.PaySpendingContractImportExcel; import com.jero.contract.vo.PaySpendingContractInput; -import com.jero.mail.entity.PayMailContract; import com.jero.mail.service.IPayMailContractService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -44,6 +41,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.InputStream; @@ -288,7 +286,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl Date: Fri, 8 Apr 2022 14:42:43 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index eed1e0c1..a0be2ad1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -58,7 +58,7 @@ AND !(if(pwgs.paid_amount is null or pwgs.paid_amount = '',0,pwgs.paid_amount) = if(pwgs.receivable_amount is null or pwgs.receivable_amount = '',0,pwgs.receivable_amount)) - + and pack = #{payWorkingGroupSubItem.pack}