Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/controller/AmendsController.java

@@ -32,11 +32,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.los.Util.IDeptUtils;
-import org.springblade.los.business.aea.entity.AeaBills;
 import org.springblade.los.business.amends.entity.Amends;
 import org.springblade.los.business.amends.service.IAmendsService;
 import org.springblade.los.business.amends.vo.AmendsVO;
-import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -108,7 +106,7 @@ public class AmendsController extends BladeController {
 				if (AuthUtil.getUserRole().contains("操作经理")) {
 					lambdaQueryWrapper.eq(Amends::getOperatorDept, AuthUtil.getDeptId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
-					lambdaQueryWrapper.eq(Amends::getOperatorId, AuthUtil.getUserId());
+					lambdaQueryWrapper.and(i -> i.eq(Amends::getOperatorId, AuthUtil.getUserId()).or().eq(Amends::getCreateUser,AuthUtil.getUserId()));
 				} else if (AuthUtil.getUserRole().contains("销售经理")) {
 					lambdaQueryWrapper.eq(Amends::getSrcDeptId, AuthUtil.getDeptId());
 				} else if (AuthUtil.getUserRole().contains("业务员")) {

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -163,7 +162,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 				return R.fail(500, "生成订单编号失败");
 			}
 			amends.setBillNo((String) clientBillNo.getData());
-			amends.setCreateTime(new Date());
+			//amends.setCreateTime(new Date());
 			amends.setCreateUser(AuthUtil.getUserId());
 			amends.setCreateUserName(AuthUtil.getUserName());
 			if (ObjectUtils.isNotNull(deptUtils.getDeptPid()+"")) {
@@ -180,7 +179,17 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 		if (ObjectUtils.isNotNull(amends.getFeeCenterList())) {
 			for (FeeCenter item : amends.getFeeCenterList()) {
 				item.setBillNo(amends.getBillNo());
-				item.setBillDate(amends.getBillDate());
+				if ("SEA".equals(amends.getBusinessType())){
+					item.setBillDate(amends.getEtd());
+				} else if ("SIA".equals(amends.getBusinessType())) {
+					item.setBillDate(amends.getEta());
+				} else if ("AEA".equals(amends.getBusinessType())) {
+					item.setBillDate(amends.getEtd());
+				} else if ("AIA".equals(amends.getBusinessType())) {
+					item.setBillDate(amends.getEta());
+				} else {
+					item.setBillDate(amends.getBillDate());
+				}
 				item.setSrcType(amends.getSrcType());
 				item.setSrcId(amends.getSrcId());
 				item.setSrcEnName(amends.getSrcEnName());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -619,10 +619,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.account_date &gt;= #{fee.etdStart}
+                and acc.business_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.account_date &lt;= #{fee.etdEnd}
+                and acc.business_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -729,10 +729,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.account_date &gt;= #{fee.etdStart}
+                and acc.business_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.account_date &lt;= #{fee.etdEnd}
+                and acc.business_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -229,12 +229,12 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			data.setBillDate(new Date());
 			data.setAccountType(finAccBills.getAccountType());
 			data.setAccountDc(item.getDc());
-			data.setAccountDate(item.getBillDate());
 			data.setBillKey(item.getBillKey());
 			data.setBusinessType(item.getBusinessType());
 			data.setBusinessBillId(item.getPid());
 			data.setBusinessBillNo(item.getBillNo());
 			data.setBusinessDate(item.getBillDate());
+			data.setAccountDate(item.getBillDate());
 			if ("SEA".equals(item.getBusinessType()) || "SIA".equals(item.getBusinessType())
 				|| "AEA".equals(item.getBusinessType()) || "AIA".equals(item.getBusinessType())) {
 				Amends amends = amendsList.stream().filter(e -> e.getId().equals(item.getPid())).findFirst().orElse(new Amends());
@@ -245,6 +245,7 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 				data.setOperatorId(amends.getOperatorId());
 				data.setOperatorName(amends.getOperatorName());
 				data.setQuantityCntrDescr(amends.getQuantityCntrDescr());
+				data.setAccountDate(amends.getCreateTime());
 			} else if ("SE".equals(item.getBusinessType()) || "SI".equals(item.getBusinessType())) {
 				Bills bills = billsList.stream().filter(e -> e.getId().equals(item.getPid())).findFirst().orElse(new Bills());
 				data.setSrcId(bills.getSrcId());
@@ -660,6 +661,7 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 				data.setQuantityCntrDescr(amends.getQuantityCntrDescr());
 				data.setTeamId(amends.getTeamId());
 				data.setTeamName(amends.getTeamName());
+				data.setAccountDate(amends.getCreateTime());
 			} else if ("SE".equals(item.getBusinessType()) || "SI".equals(item.getBusinessType())) {
 				Bills bills = billsList.stream().filter(e -> e.getId().equals(item.getPid())).findFirst().orElse(new Bills());
 				data.setSrcId(bills.getSrcId());