suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 设计组组长默认值赋值

Browse Source
This commit is contained in:
ryan.xu
2025-04-24 17:07:43 +08:00
parent ebaabf8231
commit 02743a136c
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml
View File

@@ -20,6 +20,12 @@
<result column="construction_remark" jdbcType="VARCHAR" property="constructionRemark" />
<result column="construction_create_time" jdbcType="TIMESTAMP" property="constructionCreateTime" />
<result column="construction_create_user" jdbcType="VARCHAR" property="constructionCreateUser" />
<result column="design_leader_id" jdbcType="VARCHAR" property="designLeaderId" />
<result column="design_user_id" jdbcType="VARCHAR" property="designUserId" />
<result column="quotation_user_id" jdbcType="VARCHAR" property="quotationUserId" />
<result column="quotation_remark" jdbcType="VARCHAR" property="quotationRemark" />
<result column="design_submit_time" jdbcType="TIMESTAMP" property="designSubmitTime" />
<result column="quotation_submit_time" jdbcType="TIMESTAMP" property="quotationSubmitTime" />
</resultMap>
<select id="selectByShopId" resultMap="BaseResultMap">

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -604,9 +604,9 @@ public class DecorationServiceImpl implements DecorationService {
throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE);
}
DecorationDesignVO decorationDesignVO = new DecorationDesignVO();
decorationDesignVO.setDesignUserId(measureDO.getDesignUserId());
String userName = enterpriseUserDAO.getUserName(measureDO.getMeasureUserId().toString());
decorationDesignVO.setDesignUserName(userName);
decorationDesignVO.setDesignLeaderId(measureDO.getDesignUserId());
String userName = enterpriseUserDAO.getUserName(measureDO.getDesignUserId().toString());
decorationDesignVO.setDesignLeaderName(userName);
return decorationDesignVO;
}
DecorationDesignVO decorationDesignVO = BeanUtil.toBean(decoration, DecorationDesignVO.class);

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -390,7 +390,8 @@ public class DeskServiceImpl implements DeskService {
@Override
public PageInfo<PreparationCommonPendingVO> designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
PageInfo<PreparationCommonPendingVO> pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_9,
Arrays.asList(SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()), Boolean.TRUE);
Arrays.asList(SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus(),SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus(),
SHOP_SUB_STAGE_STATUS_902.getShopSubStageStatus(),SHOP_SUB_STAGE_STATUS_903.getShopSubStageStatus()), Boolean.TRUE);
List<PreparationCommonPendingVO> list = pageInfo.getList();
if (CollectionUtils.isEmpty(list)) {
return pageInfo;