Skip to content

W
wangxiaolu-sfa-module-operation
提交 f44692e7 authored 作者: 000516's avatar 000516
浏览文件
操作

Merge branch 'master' into lql-s

上级 885e7834 7b75884f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 245 行增加 和 0 行删除
src/main/java/com/sfa/operation/controller/risk/core/RiskStoreTaskCoreController.java
浏览文件 @ f44692e7
......@@ -68,6 +68,7 @@ public class RiskStoreTaskCoreController {
if (Objects.isNull(taskDetailVo.getRstdId())){
return riskstoreTaskCoreService.saveStoreDetail(taskDetailVo);
}
// 更新稽核详情
RiskStoreTaskDto.RiskStoreTaskDetailDto riskStoreTaskDetailDto = new RiskStoreTaskDto.RiskStoreTaskDetailDto();
BeanUtils.copyProperties(taskDetailVo,riskStoreTaskDetailDto);
riskStoreTaskDetailDto.setPhotos(pArr(taskDetailVo.getPhotoArr()));
......
src/main/java/com/sfa/operation/domain/risk/dao/impl/RiskStoreTaskDaoImpl.java
浏览文件 @ f44692e7
......@@ -19,6 +19,7 @@ import com.sfa.operation.pojo.risk.response.RiskStoreTaskDto;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.Date;
......@@ -103,19 +104,24 @@ public class RiskStoreTaskDaoImpl implements IRiskStoreTaskDao {
return BeanUtils.transitionDto(taskDetailDo, RiskStoreTaskDto.RiskStoreTaskDetailDto.class);
}
@Transactional(rollbackFor = Exception.class)
@Override
public RiskStoreTaskDto.RiskStoreTaskDetailDto updateStoreDetail(RiskStoreTaskDto.RiskStoreTaskDetailDto riskStoreTaskDetailDto) {
RiskStoreTaskDetail detailDo = BeanUtils.transitionDto(riskStoreTaskDetailDto, RiskStoreTaskDetail.class);
riskStoreTaskDetailMapper.updateById(detailDo);
updateDetail(detailDo.getRstId());
RiskStoreTaskDetail riskStoreTaskDetail = riskStoreTaskDetailMapper.selectById(detailDo.getRstdId());
RiskStoreTaskDto.RiskStoreTaskDetailDto tDto = BeanUtils.transitionDto(riskStoreTaskDetail, RiskStoreTaskDto.RiskStoreTaskDetailDto.class);
rDetail(tDto);
return tDto;
}
@Transactional(rollbackFor = Exception.class)
@Override
public void deleteStoreDetail(Long rstdId) {
RiskStoreTaskDetail detailDo = riskStoreTaskDetailMapper.selectById(rstdId);
riskStoreTaskDetailMapper.deleteById(rstdId);
updateDetail(detailDo.getRstId());
}
private LambdaQueryWrapper<RiskStoreTask> buildWq(RiskStoreTaskWq wq) {
......@@ -154,6 +160,117 @@ public class RiskStoreTaskDaoImpl implements IRiskStoreTaskDao {
tDto.setKwYmHpScMap(StringUtils.isBlank(tDto.getKwYmHpSc()) ? null : JSONObject.parseObject(tDto.getKwYmHpSc(), Map.class));
}
private void updateDetail(Long rstId) {
// 查询最新数据，回写RiskStoreTask表
RiskStoreTask riskStoreTask = riskStoreTaskMapper.selectById(rstId);
riskStoreTask.detailInit();
List<RiskStoreTaskDetail> details = riskStoreTaskDetailMapper.selectList(new LambdaQueryWrapper<RiskStoreTaskDetail>().eq(RiskStoreTaskDetail::getRstId, rstId).orderByAsc(RiskStoreTaskDetail::getRstdId));
Map<String, List<RiskStoreTaskDetail>> detailMap = details.stream().collect(Collectors.groupingBy(RiskStoreTaskDetail::getDetailName));
// 常规陈列、档期补差、档期陈列、品类信息
List<RiskStoreTaskDetail> cgcls = detailMap.get("常规陈列");
if (!CollectionUtils.isEmpty(cgcls)){
if (cgcls.size() >= 1){
RiskStoreTaskDetail cgcl = cgcls.get(0);
riskStoreTask.setDModal1(cgcl.getModal());
riskStoreTask.setDCost1(cgcl.getCost());
riskStoreTask.setDPhotos1(cgcl.getPhotos());
riskStoreTask.setDRiskR1(cgcl.getRiskR());
}
if (cgcls.size() >= 2){
RiskStoreTaskDetail cgcl = cgcls.get(1);
riskStoreTask.setDModal2(cgcl.getModal());
riskStoreTask.setDCost2(cgcl.getCost());
riskStoreTask.setDPhotos2(cgcl.getPhotos());
riskStoreTask.setDRiskR2(cgcl.getRiskR());
}
if (cgcls.size() >= 3){
RiskStoreTaskDetail cgcl = cgcls.get(2);
riskStoreTask.setDModal3(cgcl.getModal());
riskStoreTask.setDCost3(cgcl.getCost());
riskStoreTask.setDPhotos3(cgcl.getPhotos());
riskStoreTask.setDRiskR3(cgcl.getRiskR());
}
}
List<RiskStoreTaskDetail> dqbcs = detailMap.get("档期补差");
if (!CollectionUtils.isEmpty(dqbcs)){
if (dqbcs.size() >= 1){
RiskStoreTaskDetail dqbc = dqbcs.get(0);
riskStoreTask.setBcNr1(dqbc.getBcNr());
riskStoreTask.setBcQk1(dqbc.getBcQk());
riskStoreTask.setBcPhotos1(dqbc.getPhotos());
riskStoreTask.setBcRiskR1(dqbc.getRiskR());
}
if (dqbcs.size() >= 2){
RiskStoreTaskDetail dqbc = dqbcs.get(1);
riskStoreTask.setBcNr2(dqbc.getBcNr());
riskStoreTask.setBcQk2(dqbc.getBcQk());
riskStoreTask.setBcPhotos2(dqbc.getPhotos());
riskStoreTask.setBcRiskR2(dqbc.getRiskR());
}
if (dqbcs.size() >= 3){
RiskStoreTaskDetail dqbc = dqbcs.get(2);
riskStoreTask.setBcNr3(dqbc.getBcNr());
riskStoreTask.setBcQk3(dqbc.getBcQk());
riskStoreTask.setBcPhotos3(dqbc.getPhotos());
riskStoreTask.setBcRiskR3(dqbc.getRiskR());
}
}
List<RiskStoreTaskDetail> dqcls = detailMap.get("档期陈列");
if (!CollectionUtils.isEmpty(dqcls)){
if (dqcls.size() >= 1){
RiskStoreTaskDetail dqcl = dqcls.get(0);
riskStoreTask.setPModal1(dqcl.getModal());
riskStoreTask.setPCost1(dqcl.getCost());
riskStoreTask.setPPhotos1(dqcl.getPhotos());
riskStoreTask.setPRiskR1(dqcl.getRiskR());
}
if (dqcls.size() >= 2){
RiskStoreTaskDetail dqcl = dqcls.get(1);
riskStoreTask.setPModal2(dqcl.getModal());
riskStoreTask.setPCost2(dqcl.getCost());
riskStoreTask.setPPhotos2(dqcl.getPhotos());
riskStoreTask.setPRiskR2(dqcl.getRiskR());
}
if (dqcls.size() >= 3){
RiskStoreTaskDetail dqcl = dqcls.get(2);
riskStoreTask.setPModal3(dqcl.getModal());
riskStoreTask.setPCost3(dqcl.getCost());
riskStoreTask.setPPhotos3(dqcl.getPhotos());
riskStoreTask.setPRiskR3(dqcl.getRiskR());
}
}
List<RiskStoreTaskDetail> plxxs = detailMap.get("品类信息");
if (!CollectionUtils.isEmpty(plxxs)){
RiskStoreTaskDetail plxx = plxxs.get(0);
riskStoreTask.setPriceHp210(plxx.getPriceHp210());
riskStoreTask.setKwYmHp210(plxx.getKwYmHp210());
riskStoreTask.setPriceHp105(plxx.getPriceHp105());
riskStoreTask.setKwYmHp105(plxx.getKwYmHp105());
riskStoreTask.setPriceHp68(plxx.getPriceHp68());
riskStoreTask.setKwYmHp68(plxx.getKwYmHp68());
riskStoreTask.setPriceJrdb120(plxx.getPriceJrdb120());
riskStoreTask.setKwYmJrdb120(plxx.getKwYmJrdb120());
riskStoreTask.setPriceNrdb120(plxx.getPriceNrdb120());
riskStoreTask.setKwYmNrdb120(plxx.getKwYmNrdb120());
riskStoreTask.setPriceQg72(plxx.getPriceQg72());
riskStoreTask.setKwYmQg72(plxx.getKwYmQg72());
riskStoreTask.setPriceQg138(plxx.getPriceQg138());
riskStoreTask.setKwYmQg138(plxx.getKwYmQg138());
riskStoreTask.setPriceHpjt80(plxx.getPriceHpjt80());
riskStoreTask.setKwYmHpjt80(plxx.getKwYmHpjt80());
riskStoreTask.setPriceLl(plxx.getPriceLl());
riskStoreTask.setKwYmLl(plxx.getKwYmLl());
riskStoreTask.setPriceHpDz(plxx.getPriceHpDz());
riskStoreTask.setKwYmHpDz(plxx.getKwYmHpDz());
riskStoreTask.setPriceHpSc(plxx.getPriceHpSc());
riskStoreTask.setKwYmHpSc(plxx.getKwYmHpSc());
}
riskStoreTaskMapper.updateDetailById(riskStoreTask);
}
......
src/main/java/com/sfa/operation/domain/risk/mapper/RiskStoreTaskMapper.java
浏览文件 @ f44692e7
......@@ -13,6 +13,7 @@ import org.springframework.stereotype.Repository;
@Repository
public interface RiskStoreTaskMapper extends BaseMapper<RiskStoreTask> {
void updateDetailById(RiskStoreTask riskStoreTask);
}
......
src/main/resources/mapper/risk/RiskStoreTaskMapper.xml
浏览文件 @ f44692e7
......@@ -21,6 +21,66 @@
<result property="skuNum" column="sku_num" jdbcType="INTEGER"/>
<result property="longTimePictures" column="long_time_pictures" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="cgclRiskR" column="cgcl_risk_r" jdbcType="VARCHAR"/>
<result property="dqclRiskR" column="dqcl_risk_r" jdbcType="VARCHAR"/>
<result property="dModal1" column="d_modal1" jdbcType="VARCHAR"/>
<result property="dCost1" column="d_cost1" jdbcType="DECIMAL"/>
<result property="dPhotos1" column="d_photos1" jdbcType="VARCHAR"/>
<result property="dRiskR1" column="d_risk_r1" jdbcType="VARCHAR"/>
<result property="dModal2" column="d_modal2" jdbcType="VARCHAR"/>
<result property="dCost2" column="d_cost2" jdbcType="DECIMAL"/>
<result property="dPhotos2" column="d_photos2" jdbcType="VARCHAR"/>
<result property="dRiskR2" column="d_risk_r2" jdbcType="VARCHAR"/>
<result property="dModal3" column="d_modal3" jdbcType="VARCHAR"/>
<result property="dCost3" column="d_cost3" jdbcType="DECIMAL"/>
<result property="dPhotos3" column="d_photos3" jdbcType="VARCHAR"/>
<result property="dRiskR3" column="d_risk_r3" jdbcType="VARCHAR"/>
<result property="pModal1" column="p_modal1" jdbcType="VARCHAR"/>
<result property="pCost1" column="p_cost1" jdbcType="DECIMAL"/>
<result property="pPhotos1" column="p_photos1" jdbcType="VARCHAR"/>
<result property="pRiskR1" column="p_risk_r1" jdbcType="VARCHAR"/>
<result property="pModal2" column="p_modal2" jdbcType="VARCHAR"/>
<result property="pCost2" column="p_cost2" jdbcType="DECIMAL"/>
<result property="pPhotos2" column="p_photos2" jdbcType="VARCHAR"/>
<result property="pRiskR2" column="p_risk_r2" jdbcType="VARCHAR"/>
<result property="pModal3" column="p_modal3" jdbcType="VARCHAR"/>
<result property="pCost3" column="p_cost3" jdbcType="DECIMAL"/>
<result property="pPhotos3" column="p_photos3" jdbcType="VARCHAR"/>
<result property="pRiskR3" column="p_risk_r3" jdbcType="VARCHAR"/>
<result property="bcNr1" column="bc_nr1" jdbcType="VARCHAR"/>
<result property="bcQk1" column="bc_qk1" jdbcType="VARCHAR"/>
<result property="bcPhotos1" column="bc_photos1" jdbcType="VARCHAR"/>
<result property="bcRiskR1" column="bc_risk_r1" jdbcType="VARCHAR"/>
<result property="bcNr2" column="bc_nr2" jdbcType="VARCHAR"/>
<result property="bcQk2" column="bc_qk2" jdbcType="VARCHAR"/>
<result property="bcPhotos2" column="bc_photos2" jdbcType="VARCHAR"/>
<result property="bcRiskR2" column="bc_risk_r2" jdbcType="VARCHAR"/>
<result property="bcNr3" column="bc_nr3" jdbcType="VARCHAR"/>
<result property="bcQk3" column="bc_qk3" jdbcType="VARCHAR"/>
<result property="bcPhotos3" column="bc_photos3" jdbcType="VARCHAR"/>
<result property="bcRiskR3" column="bc_risk_r3" jdbcType="VARCHAR"/>
<result property="priceHp210" column="price_hp210" jdbcType="VARCHAR"/>
<result property="kwYmHp210" column="kw_ym_hp210" jdbcType="VARCHAR"/>
<result property="priceHp105" column="price_hp105" jdbcType="VARCHAR"/>
<result property="kwYmHp105" column="kw_ym_hp105" jdbcType="VARCHAR"/>
<result property="priceHp68" column="price_hp68" jdbcType="VARCHAR"/>
<result property="kwYmHp68" column="kw_ym_hp68" jdbcType="VARCHAR"/>
<result property="priceJrdb120" column="price_jrdb120" jdbcType="VARCHAR"/>
<result property="kwYmJrdb120" column="kw_ym_jrdb120" jdbcType="VARCHAR"/>
<result property="priceNrdb120" column="price_nrdb120" jdbcType="VARCHAR"/>
<result property="kwYmNrdb120" column="kw_ym_nrdb120" jdbcType="VARCHAR"/>
<result property="priceQg72" column="price_qg72" jdbcType="VARCHAR"/>
<result property="kwYmQg72" column="kw_ym_qg72" jdbcType="VARCHAR"/>
<result property="priceQg138" column="price_qg138" jdbcType="VARCHAR"/>
<result property="kwYmQg138" column="kw_ym_qg138" jdbcType="VARCHAR"/>
<result property="priceHpjt80" column="price_hpjt80" jdbcType="VARCHAR"/>
<result property="kwYmHpjt80" column="kw_ym_hpjt80" jdbcType="VARCHAR"/>
<result property="priceLl" column="price_ll" jdbcType="VARCHAR"/>
<result property="kwYmLl" column="kw_ym_ll" jdbcType="VARCHAR"/>
<result property="priceHpDz" column="price_hp_dz" jdbcType="VARCHAR"/>
<result property="kwYmHpDz" column="kw_ym_hp_dz" jdbcType="VARCHAR"/>
<result property="priceHpSc" column="price_hp_sc" jdbcType="VARCHAR"/>
<result property="kwYmHpSc" column="kw_ym_hp_sc" jdbcType="VARCHAR"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="createEmpNo" column="create_emp_no" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
......@@ -28,4 +88,70 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<update id="updateDetailById" parameterType="com.sfa.operation.domain.risk.entity.RiskStoreTask">
UPDATE risk_store_task
<set>
d_modal1 = #{dModal1},
d_cost1 = #{dCost1},
d_photos1 = #{dPhotos1},
d_risk_r1 = #{dRiskR1},
d_modal2 = #{dModal2},
d_cost2 = #{dCost2},
d_photos2 = #{dPhotos2},
d_risk_r2 = #{dRiskR2},
d_modal3 = #{dModal3},
d_cost3 = #{dCost3},
d_photos3 = #{dPhotos3},
d_risk_r3 = #{dRiskR3},
p_modal1 = #{pModal1},
p_cost1 = #{pCost1},
p_photos1 = #{pPhotos1},
p_risk_r1 = #{pRiskR1},
p_modal2 = #{pModal2},
p_cost2 = #{pCost2},
p_photos2 = #{pPhotos2},
p_risk_r2 = #{pRiskR2},
p_modal3 = #{pModal3},
p_cost3 = #{pCost3},
p_photos3 = #{pPhotos3},
p_risk_r3 = #{pRiskR3},
bc_nr1 = #{bcNr1},
bc_qk1 = #{bcQk1},
bc_photos1 = #{bcPhotos1},
bc_risk_r1 = #{bcRiskR1},
bc_nr2 = #{bcNr2},
bc_qk2 = #{bcQk2},
bc_photos2 = #{bcPhotos2},
bc_risk_r2 = #{bcRiskR2},
bc_nr3 = #{bcNr3},
bc_qk3 = #{bcQk3},
bc_photos3 = #{bcPhotos3},
bc_risk_r3 = #{bcRiskR3},
price_hp210 = #{priceHp210},
kw_ym_hp210 = #{kwYmHp210},
price_hp105 = #{priceHp105},
kw_ym_hp105 = #{kwYmHp105},
price_hp68 = #{priceHp68},
kw_ym_hp68 = #{kwYmHp68},
price_jrdb120 = #{priceJrdb120},
kw_ym_jrdb120 = #{kwYmJrdb120},
price_nrdb120 = #{priceNrdb120},
kw_ym_nrdb120 = #{kwYmNrdb120},
price_qg72 = #{priceQg72},
kw_ym_qg72 = #{kwYmQg72},
price_qg138 = #{priceQg138},
kw_ym_qg138 = #{kwYmQg138},
price_hpjt80 = #{priceHpjt80},
kw_ym_hpjt80 = #{kwYmHpjt80},
price_ll = #{priceLl},
kw_ym_ll = #{kwYmLl},
price_hp_dz = #{priceHpDz},
kw_ym_hp_dz = #{kwYmHpDz},
price_hp_sc = #{priceHpSc},
kw_ym_hp_sc = #{kwYmHpSc},
update_time = NOW()
</set>
WHERE rst_id = #{rstId}
</update>
</mapper>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论