Commit 67610206 authored by qinhu's avatar qinhu

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanStandardPurchaseController.java
#	cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanStandardPurchaseServiceImpl.java
parents 9713c868 02b60fd2
...@@ -100,6 +100,9 @@ public class NonStandardApprovalController { ...@@ -100,6 +100,9 @@ public class NonStandardApprovalController {
@PostMapping("/updateAppraisal") @PostMapping("/updateAppraisal")
public BaseResponse update(Double appraisalValue) { public BaseResponse update(Double appraisalValue) {
try { try {
if (appraisalValue == null || appraisalValue==0){
return BaseResponse.okMsg("考核公值不能为空或0!");
}
return iNonStandardApprovalService.updateAppraisal(appraisalValue); return iNonStandardApprovalService.updateAppraisal(appraisalValue);
} catch (Exception e) { } catch (Exception e) {
log.debug("审批通过/驳回{}", e); log.debug("审批通过/驳回{}", e);
......
...@@ -29,34 +29,35 @@ import javax.servlet.http.HttpServletResponse; ...@@ -29,34 +29,35 @@ import javax.servlet.http.HttpServletResponse;
@RequestMapping("/business/plan-standard-purchase") @RequestMapping("/business/plan-standard-purchase")
public class PlanStandardPurchaseController { public class PlanStandardPurchaseController {
private static final Logger log = LoggerFactory.getLogger("PlanStandardPurchaseController"); private static final Logger log = LoggerFactory.getLogger("PlanStandardPurchaseController");
@Autowired @Autowired
private IPlanStandardPurchaseService standardPurchaseService; private IPlanStandardPurchaseService standardPurchaseService;
@ApiOperation(value = "标样采购计划分页列表") @ApiOperation(value = "标样采购计划分页列表")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String") @ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String"),
}) @ApiImplicitParam(name = "code", value = "标物编号", paramType = "query", dataType = "String")
@GetMapping("/getPage") })
public BaseResponse getPage(PageQuery pageQuery, String name) { @GetMapping("/getPage")
try { public BaseResponse getPage(PageQuery pageQuery, String name,String code) {
return standardPurchaseService.getPage(pageQuery, name); try {
} catch (Exception e) { return standardPurchaseService.getPage(pageQuery, name,code);
log.debug("标样采购计划分页列表{}", e); } catch (Exception e) {
} log.debug("标样采购计划分页列表{}", e);
return BaseResponse.errorMsg("失败!"); }
} return BaseResponse.errorMsg("失败!");
}
@ApiOperation("标样采购计划列表导出")
@PostMapping("/export") @ApiOperation("标样采购计划列表导出")
public void export(String name, String fileName, HttpServletResponse response) { @PostMapping("/export")
try { public void export(String name, String fileName, HttpServletResponse response) {
standardPurchaseService.export(name, fileName, response); try {
} catch (Exception e) { standardPurchaseService.export(name, fileName, response);
log.debug("标样采购计划列表导出{}", e); } catch (Exception e) {
} log.debug("标样采购计划列表导出{}", e);
} }
}
@ApiOperation("标样采购计划列表导出(word)") @ApiOperation("标样采购计划列表导出(word)")
...@@ -88,38 +89,38 @@ public class PlanStandardPurchaseController { ...@@ -88,38 +89,38 @@ public class PlanStandardPurchaseController {
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "标样采购计划详情") @ApiOperation(value = "标样采购计划详情")
@GetMapping("/{id}") @GetMapping("/{id}")
public BaseResponse getDetail(@PathVariable Integer id) { public BaseResponse getDetail(@PathVariable Integer id) {
try { try {
return standardPurchaseService.getDetail(id); return standardPurchaseService.getDetail(id);
} catch (Exception e) { } catch (Exception e) {
log.debug("标样采购计划详情{}", e); log.debug("标样采购计划详情{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "采购完成") @ApiOperation(value = "采购完成")
@PostMapping("/finish") @PostMapping("/finish")
public BaseResponse finish(Integer id) { public BaseResponse finish(Integer id) {
try { try {
return standardPurchaseService.finish(id); return standardPurchaseService.finish(id);
} catch (Exception e) { } catch (Exception e) {
log.debug("采购完成{}", e); log.debug("采购完成{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "删除") @ApiOperation(value = "删除")
@PostMapping("/delete/{id}") @PostMapping("/delete/{id}")
public BaseResponse delete(@PathVariable Integer id) { public BaseResponse delete(@PathVariable Integer id) {
try { try {
return standardPurchaseService.delete(id); return standardPurchaseService.delete(id);
} catch (Exception e) { } catch (Exception e) {
log.debug("删除{}", e); log.debug("删除{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
} }
...@@ -35,12 +35,12 @@ public class NonStandardValue implements Serializable { ...@@ -35,12 +35,12 @@ public class NonStandardValue implements Serializable {
@ApiModelProperty("起止日期") @ApiModelProperty("起止日期")
private String statistical; private String statistical;
@ApiModelProperty("上报工时")
private Double approvalHours;
@ApiModelProperty("上报工日") @ApiModelProperty("上报工日")
private Double reportedHours; private Double reportedHours;
@ApiModelProperty("审批工时")
private Double approvalHours;
@ApiModelProperty("状态 0:未提交 1:待审批 2:已通过 3:未通过") @ApiModelProperty("状态 0:未提交 1:待审批 2:已通过 3:未通过")
private Integer status; private Integer status;
...@@ -59,9 +59,6 @@ public class NonStandardValue implements Serializable { ...@@ -59,9 +59,6 @@ public class NonStandardValue implements Serializable {
@ApiModelProperty("开始时间") @ApiModelProperty("开始时间")
private LocalDate startTime; private LocalDate startTime;
@ApiModelProperty("结束时间")
private LocalDate endTime;
@ApiModelProperty("用户id") @ApiModelProperty("用户id")
private Integer userId; private Integer userId;
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
LEFT JOIN sys_user su ON su.id = na.user_id LEFT JOIN sys_user su ON su.id = na.user_id
LEFT JOIN sys_group sg ON sg.id = su.group_id LEFT JOIN sys_group sg ON sg.id = su.group_id
<include refid="where"/> <include refid="where"/>
order by na.id asc order by na.start_time desc
</select> </select>
<!-- <select id="getByUserId" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">--> <!-- <select id="getByUserId" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">-->
<!-- select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups,sg.name as--> <!-- select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups,sg.name as-->
......
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<if test="params.name != null and params.name != ''"> <if test="params.name != null and params.name != ''">
and t.name like concat('%', #{params.name}, '%') and t.name like concat('%', #{params.name}, '%')
</if> </if>
<if test="params.code != null and params.code != ''">
and t.code like concat('%', #{params.code}, '%')
</if>
</where> </where>
</sql> </sql>
......
...@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
*/ */
public interface IPlanStandardPurchaseService extends IService<PlanStandardPurchase> { public interface IPlanStandardPurchaseService extends IService<PlanStandardPurchase> {
BaseResponse<IPage<PlanStandardPurchaseVo>> getPage(PageQuery pageQuery, String name); BaseResponse<IPage<PlanStandardPurchaseVo>> getPage(PageQuery pageQuery, String name,String code);
void export(String name, String fileName, HttpServletResponse response); void export(String name, String fileName, HttpServletResponse response);
......
...@@ -84,6 +84,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap ...@@ -84,6 +84,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
//初始化最终结果===>不初始化默认为NULL,不能进行+——*/ //初始化最终结果===>不初始化默认为NULL,不能进行+——*/
finalNonStandardValue.setId(0); finalNonStandardValue.setId(0);
finalNonStandardValue.setApprovalHours(0D); finalNonStandardValue.setApprovalHours(0D);
finalNonStandardValue.setReportedHours(0D);
finalNonStandardValue.setFinalValue(0D); finalNonStandardValue.setFinalValue(0D);
//todo 为当前userID创建一天展示的产值对象 new 产值对象 ===>传出 //todo 为当前userID创建一天展示的产值对象 new 产值对象 ===>传出
for (NonStandardValueVo nonStandardValue : data) { for (NonStandardValueVo nonStandardValue : data) {
...@@ -113,6 +114,11 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap ...@@ -113,6 +114,11 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
//用新得到的最总工时覆盖掉原来的总工时===>累加 //用新得到的最总工时覆盖掉原来的总工时===>累加
finalNonStandardValue.setApprovalHours(newApprovalHours); finalNonStandardValue.setApprovalHours(newApprovalHours);
Double RHhouers = nonStandardValue.getReportedHours().doubleValue();
Double newReportedHours = nonStandardValue.getReportedHours() + finalNonStandardValue.getReportedHours();
//用新得到的最总工时覆盖掉原来的总工时===>累加
finalNonStandardValue.setReportedHours(newReportedHours);
Double finalValue = nonStandardValue.getFinalValue().doubleValue(); Double finalValue = nonStandardValue.getFinalValue().doubleValue();
Double newFinalValue = nonStandardValue.getFinalValue() + finalNonStandardValue.getFinalValue(); Double newFinalValue = nonStandardValue.getFinalValue() + finalNonStandardValue.getFinalValue();
finalNonStandardValue.setFinalValue(newFinalValue); finalNonStandardValue.setFinalValue(newFinalValue);
......
...@@ -49,179 +49,180 @@ import java.util.Map; ...@@ -49,179 +49,180 @@ import java.util.Map;
@Service @Service
public class PlanStandardPurchaseServiceImpl extends ServiceImpl<PlanStandardPurchaseMapper, PlanStandardPurchase> implements IPlanStandardPurchaseService { public class PlanStandardPurchaseServiceImpl extends ServiceImpl<PlanStandardPurchaseMapper, PlanStandardPurchase> implements IPlanStandardPurchaseService {
@Resource @Resource
private PlanStandardPurchaseMapper standardPurchaseMapper; private PlanStandardPurchaseMapper standardPurchaseMapper;
@Autowired @Autowired
private ISysUserService userService; private ISysUserService userService;
/** /**
* 分页查询 * 分页查询
* *
* @param pageQuery * @param pageQuery
* @param name * @param name
* @return * @return
*/ */
@Override @Override
public BaseResponse<IPage<PlanStandardPurchaseVo>> getPage(PageQuery pageQuery, String name) { public BaseResponse<IPage<PlanStandardPurchaseVo>> getPage(PageQuery pageQuery, String name,String code) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("name", name); params.put("name", name);
Page<PlanStandardPurchaseVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize()); params.put("code", code);
IPage<PlanStandardPurchaseVo> pages = standardPurchaseMapper.getPage(page, params); Page<PlanStandardPurchaseVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
return BaseResponse.okData(pages); IPage<PlanStandardPurchaseVo> pages = standardPurchaseMapper.getPage(page, params);
} return BaseResponse.okData(pages);
}
/** /**
* 标样采购计划导出 * 标样采购计划导出
* *
* @param name * @param name
* @param fileName * @param fileName
* @param response * @param response
*/ */
@Override @Override
public void export(String name, String fileName, HttpServletResponse response) { public void export(String name, String fileName, HttpServletResponse response) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("name", name); params.put("name", name);
List<Map<String, Object>> list = standardPurchaseMapper.exportList(params); List<Map<String, Object>> list = standardPurchaseMapper.exportList(params);
if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(list)) { if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(list)) {
Map<String, Object> map = list.get(0); Map<String, Object> map = list.get(0);
String[] headers = new String[map.size()]; String[] headers = new String[map.size()];
headers[0] = "序号"; headers[0] = "序号";
headers[1] = "标物名称"; headers[1] = "标物名称";
headers[2] = "经销单位"; headers[2] = "经销单位";
headers[3] = "采购数量"; headers[3] = "采购数量";
headers[4] = "采购时间"; headers[4] = "采购时间";
headers[5] = "采购人"; headers[5] = "采购人";
List<Object[]> datas = new ArrayList<>(list.size()); List<Object[]> datas = new ArrayList<>(list.size());
for (Map<String, Object> m : list) { for (Map<String, Object> m : list) {
Object[] objects = new Object[headers.length]; Object[] objects = new Object[headers.length];
for (int j = 0; j < headers.length; j++) { for (int j = 0; j < headers.length; j++) {
String obj = m.get(headers[j]).toString(); String obj = m.get(headers[j]).toString();
if (j == 0) { if (j == 0) {
obj = obj.split("\\.")[0]; obj = obj.split("\\.")[0];
} }
objects[j] = obj; objects[j] = obj;
} }
datas.add(objects); datas.add(objects);
} }
ExcelUtil.excelExport( ExcelUtil.excelExport(
fileName == null || fileName.trim().length() <= 0 ? "标样采购计划" : fileName, headers, fileName == null || fileName.trim().length() <= 0 ? "标样采购计划" : fileName, headers,
datas, response); datas, response);
} }
} }
/** /**
* 创建 * 创建
* *
* @param query * @param query
* @return * @return
*/ */
@Transactional @Transactional
@Override @Override
public BaseResponse<PlanStandardPurchase> create(PlanStandardPurchaseQuery query) { public BaseResponse<PlanStandardPurchase> create(PlanStandardPurchaseQuery query) {
LoginUser loginUser = userService.getLoginUser(); LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) { if (loginUser == null) {
return BaseResponse.errorMsg("请登录用户"); return BaseResponse.errorMsg("请登录用户");
} }
if (StringUtils.isEmpty(query.getName())) { if (StringUtils.isEmpty(query.getName())) {
return BaseResponse.errorMsg("产品名称不能为空!"); return BaseResponse.errorMsg("产品名称不能为空!");
} }
QueryWrapper<PlanStandardPurchase> qw = new QueryWrapper<>(); QueryWrapper<PlanStandardPurchase> qw = new QueryWrapper<>();
qw.eq("name", query.getName()); qw.eq("name", query.getName());
int count = standardPurchaseMapper.selectCount(qw); int count = standardPurchaseMapper.selectCount(qw);
if (count > 0) { if (count > 0) {
return BaseResponse.errorMsg(query.getName() + "已存在"); return BaseResponse.errorMsg(query.getName() + "已存在");
} }
PlanStandardPurchase pep = new PlanStandardPurchase(); PlanStandardPurchase pep = new PlanStandardPurchase();
BeanUtils.copyProperties(query, pep); BeanUtils.copyProperties(query, pep);
pep.setUserId(loginUser.getId()) pep.setUserId(loginUser.getId())
.setStatus(0) .setStatus(0)
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
standardPurchaseMapper.insert(pep); standardPurchaseMapper.insert(pep);
return BaseResponse.okData(pep); return BaseResponse.okData(pep);
} }
/** /**
* 修改 * 修改
* *
* @param query * @param query
* @return * @return
*/ */
@Transactional @Transactional
@Override @Override
public BaseResponse<PlanStandardPurchase> update(PlanStandardPurchaseQuery query) { public BaseResponse<PlanStandardPurchase> update(PlanStandardPurchaseQuery query) {
if (StringUtils.isEmpty(query.getName())) { if (StringUtils.isEmpty(query.getName())) {
return BaseResponse.errorMsg("产品名称不能为空!"); return BaseResponse.errorMsg("产品名称不能为空!");
} }
QueryWrapper<PlanStandardPurchase> qw = new QueryWrapper<>(); QueryWrapper<PlanStandardPurchase> qw = new QueryWrapper<>();
qw.eq("name", query.getName()); qw.eq("name", query.getName());
qw.ne("id", query.getId()); qw.ne("id", query.getId());
int count = standardPurchaseMapper.selectCount(qw); int count = standardPurchaseMapper.selectCount(qw);
if (count > 0) { if (count > 0) {
return BaseResponse.errorMsg(query.getName() + "已存在"); return BaseResponse.errorMsg(query.getName() + "已存在");
} }
PlanStandardPurchase pep = standardPurchaseMapper.selectById(query.getId()); PlanStandardPurchase pep = standardPurchaseMapper.selectById(query.getId());
BeanUtils.copyProperties(query, pep); BeanUtils.copyProperties(query, pep);
standardPurchaseMapper.updateById(pep); standardPurchaseMapper.updateById(pep);
return BaseResponse.okData(pep); return BaseResponse.okData(pep);
} }
/** /**
* 获取详情 * 获取详情
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public BaseResponse<PlanStandardPurchaseVo> getDetail(Integer id) { public BaseResponse<PlanStandardPurchaseVo> getDetail(Integer id) {
if (id == null) { if (id == null) {
return BaseResponse.errorMsg("参数错误!"); return BaseResponse.errorMsg("参数错误!");
} }
PlanStandardPurchase pep = standardPurchaseMapper.selectById(id); PlanStandardPurchase pep = standardPurchaseMapper.selectById(id);
if (pep == null) { if (pep == null) {
return BaseResponse.errorMsg("信息错误!"); return BaseResponse.errorMsg("信息错误!");
} }
PlanStandardPurchaseVo planEquipmentPurchaseVo = standardPurchaseMapper.getDetail(id); PlanStandardPurchaseVo planEquipmentPurchaseVo = standardPurchaseMapper.getDetail(id);
return BaseResponse.okData(planEquipmentPurchaseVo); return BaseResponse.okData(planEquipmentPurchaseVo);
} }
/** /**
* 采购完成 * 采购完成
* *
* @param id * @param id
* @return * @return
*/ */
@Transactional @Transactional
@Override @Override
public BaseResponse<String> finish(Integer id) { public BaseResponse<String> finish(Integer id) {
if (id == null) { if (id == null) {
return BaseResponse.errorMsg("参数错误!"); return BaseResponse.errorMsg("参数错误!");
} }
PlanStandardPurchase pep = standardPurchaseMapper.selectById(id); PlanStandardPurchase pep = standardPurchaseMapper.selectById(id);
if (pep == null) { if (pep == null) {
return BaseResponse.errorMsg("数据错误!"); return BaseResponse.errorMsg("数据错误!");
} }
pep.setStatus(1); //采购完成 pep.setStatus(1); //采购完成
standardPurchaseMapper.updateById(pep); standardPurchaseMapper.updateById(pep);
return BaseResponse.okData("采购完成"); return BaseResponse.okData("采购完成");
} }
/** /**
* 删除 * 删除
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public BaseResponse<String> delete(Integer id) { public BaseResponse<String> delete(Integer id) {
PlanStandardPurchase pep = standardPurchaseMapper.selectById(id); PlanStandardPurchase pep = standardPurchaseMapper.selectById(id);
if (pep == null) { if (pep == null) {
return BaseResponse.errorMsg("数据错误!"); return BaseResponse.errorMsg("数据错误!");
} }
standardPurchaseMapper.deleteById(id); standardPurchaseMapper.deleteById(id);
return BaseResponse.okData("删除成功"); return BaseResponse.okData("删除成功");
} }
@Override @Override
public void exportWord(HttpServletResponse response) { public void exportWord(HttpServletResponse response) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment