Compare commits

..

No commits in common. "c0e7bf8d7c7349a8de1ee982bbd63d7b1e503543" and "490751d1438fa07d922e8f25a21aa2b632edf222" have entirely different histories.

4 changed files with 1 additions and 25 deletions

View File

@ -8,7 +8,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
@ -118,18 +117,6 @@ public class PurchaseMacodeInfo extends BaseEntity
@ApiModelProperty(value = "单位名称")
private String unitName;
/** 审核员用户id */
@ApiModelProperty(value = "审核员用户id")
private List<String> userIds;
public List<String> getUserIds() {
return userIds;
}
public void setUserIds(List<String> userIds) {
this.userIds = userIds;
}
/**
* 类型管理方式
*/

View File

@ -282,6 +282,4 @@ public interface PurchaseMacodeInfoMapper {
int updateMaTypeNum(MachinePart wholeSetDetail);
List<PurchaseMacodeInfo> selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo);
List<String> selectKeepUser(Integer typeId);
}

View File

@ -427,13 +427,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
*/
@Override
public List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo) {
List<PurchaseMacodeInfo> purchaseMacodeInfos = purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo);
for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) {
List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue());
userIds.add("1");
macodeInfo.setUserIds(userIds);
}
return purchaseMacodeInfos;
return purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo);
}
@Override

View File

@ -540,9 +540,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND pcd.`status` != 3
AND pcd.`status` != 5
</select>
<select id="selectKeepUser" resultType="java.lang.String">
SELECT user_id FROM ma_type_keeper WHERE type_id = #{typeId}
</select>
<update id="updateTypeByTypeId">
update ma_type set num = #{num} where type_id = #{typeId}