bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并分支，处理冲突异常

This commit is contained in:
syruan 2023-12-22 15:21:18 +08:00
parent bf0c462853
commit 3e1839ce64
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -113,7 +113,7 @@ public class TmTaskController extends BaseController {
// 根据设备所属分公司拆分集合 // 根据设备所属分公司拆分集合
List<List<LeaseApplyDetails>> deviceByCompanyList = CollUtil.groupByField(task.getLeaseApplyDetails(), "companyId"); List<List<LeaseApplyDetails>> deviceByCompanyList = CollUtil.groupByField(task.getLeaseApplyDetails(), "companyId");
// 对拆分后的集合进行遍历 // 对拆分后的集合进行each遍历
for (List<LeaseApplyDetails> leaseApplyDetailsList : deviceByCompanyList) { for (List<LeaseApplyDetails> leaseApplyDetailsList : deviceByCompanyList) {
// 判断拆分后的集合内是否有数据 // 判断拆分后的集合内是否有数据
if (CollUtil.isNotEmpty(leaseApplyDetailsList)) { if (CollUtil.isNotEmpty(leaseApplyDetailsList)) {

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
View File

@ -20,7 +20,7 @@ import java.util.List;
public interface TmTaskMapper { public interface TmTaskMapper {
/** /**
* 获取领料审核列表 by TmTask * 获取领料审核列表 by_TmTask
* @param record 筛选条件 * @param record 筛选条件
* @return TmTask列表 * @return TmTask列表
*/ */

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
View File

@ -18,7 +18,7 @@ public interface TmTaskService{
List<TmTask> getLeaseAuditList(TmTask record); List<TmTask> getLeaseAuditList(TmTask record);
/** 领料任务审核状态 */ /** 领料任务审核状态修改 */
int updateLeaseTaskAuditInfo(TmTask record); int updateLeaseTaskAuditInfo(TmTask record);
String genderLeaseCode(); String genderLeaseCode();

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -7,7 +7,6 @@ import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.utils.StringHelper;
import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -17,7 +16,6 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Random;
/** /**
* Description: * Description:
@ -56,7 +54,7 @@ public class TmTaskServiceImpl implements TmTaskService{
count += leaseApplyDetail.getPreNum(); count += leaseApplyDetail.getPreNum();
} }
} }
// 塞入领料任务详情集合 // 塞入领料任务详情的集合中
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
} }
} }

1
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -129,7 +129,6 @@
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.bonus.sgzb.base.api.domain.TmTask"> <update id="updateByPrimaryKey" parameterType="com.bonus.sgzb.base.api.domain.TmTask">
<!--@mbg.generated-->
update tm_task update tm_task
set task_type = #{taskType,jdbcType=INTEGER}, set task_type = #{taskType,jdbcType=INTEGER},
task_status = #{taskStatus,jdbcType=INTEGER}, task_status = #{taskStatus,jdbcType=INTEGER},