wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report

Browse Source
This commit is contained in:
杜建超 2020-09-27 17:54:17 +08:00
commit dec93bf39b
13 changed files with 130 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/lz/modules/equipment/controller/EquipmentBrandController.java
View File

@ -9,6 +9,7 @@ import com.lz.modules.equipment.entity.EquipmentBrandReq;
import com.lz.modules.equipment.entity.EquipmentType;
import com.lz.modules.equipment.entity.resp.EquipmentBrandResp;
import com.lz.modules.equipment.service.EquipmentBrandService;
import com.lz.modules.equipment.service.IEquipmentInfoService;
import com.lz.modules.equipment.service.IEquipmentTypeService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@ -39,6 +40,9 @@ public class EquipmentBrandController {
@Autowired
private IEquipmentTypeService equipmentTypeService;
@Resource
private IEquipmentInfoService equipmentInfoService;
/**
* 添加品牌表页面
*
@ -91,6 +95,7 @@ public class EquipmentBrandController {
EquipmentBrand equipmentBrand = equipmentBrandService.selectEquipmentBrandById(req.getId());
BeanUtils.copyProperty(equipmentBrand, req, true);
equipmentBrandService.updateEquipmentBrandById(equipmentBrand);
equipmentInfoService.updateCoverEquipmentInfoByBrandId(equipmentBrand.getId(), equipmentBrand.getBrand());
return R.ok("编辑成功");
}

14
src/main/java/com/lz/modules/equipment/controller/EquipmentController.java
View File

@ -64,23 +64,27 @@ public class EquipmentController extends AbstractController {
return R.ok();
}
FindEquipmentResModel model = new FindEquipmentResModel();
/*//下面的逻辑有bug下周修复20200925 20200927修复，注释掉
EquipmentType equipmentType = iEquipmentTypeService.selectByType(equipmentInfo.getType());
EquipmentBrand equipmentBrand = equipmentBrandService.selectByBrand(equipmentInfo.getBrandName());
EquipmentSpecs equipmentSpecs = equipmentSpecsService.selectSpecs(equipmentInfo.getSpecType());
EquipmentSpecs equipmentSpecs = equipmentSpecsService.selectSpecs(equipmentInfo.getSpecType());*/
BeanUtils.copyProperties(equipmentInfo,model);
model.setState(equipmentInfo.getEquipmentState());
if(equipmentInfo.getSaiId()!=null){
model.setUserId(equipmentInfo.getSaiId());
model.setEmployee(false);
}
Optional.ofNullable(equipmentType).ifPresent(equipmentType1 -> model.setTypeId(equipmentType1.getId()));
model.setTypeId(equipmentInfo.getTypeId());
model.setBrandId(equipmentInfo.getBrandId());
model.setSpecId(equipmentInfo.getSpecsId());
/*Optional.ofNullable(equipmentType).ifPresent(equipmentType1 -> model.setTypeId(equipmentType1.getId()));
Optional.ofNullable(equipmentBrand).ifPresent(equipmentBrand1 -> model.setBrandId(equipmentBrand1.getId()));
Optional.ofNullable(equipmentSpecs).ifPresent(new Consumer<EquipmentSpecs>() {
@Override
public void accept(EquipmentSpecs equipmentSpecs1) {
model.setSpecId(equipmentSpecs1.getId());
}
});
});*/
addRecord(equipmentInfo);
return R.ok().put("data", model);
@ -112,8 +116,8 @@ public class EquipmentController extends AbstractController {
try {
iEquipmentInfoService.changeEquipmentInfo(dto,getUser());
} catch (Exception e) {
log.error("绑定设备异常",e);
return R.error();
log.error("绑定设备异常{}",e);
return R.error(e.getMessage());
}
return R.ok();

5
src/main/java/com/lz/modules/equipment/controller/EquipmentSpecsController.java
View File

@ -10,6 +10,7 @@ import com.lz.modules.equipment.entity.EquipmentType;
import com.lz.modules.equipment.entity.resp.EquipmentSpecsResp;
import com.lz.modules.equipment.service.EquipmentBrandService;
import com.lz.modules.equipment.service.EquipmentSpecsService;
import com.lz.modules.equipment.service.IEquipmentInfoService;
import com.lz.modules.equipment.service.IEquipmentTypeService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,6 +41,9 @@ public class EquipmentSpecsController {
@Autowired
private EquipmentBrandService equipmentBrandService;
@Resource
private IEquipmentInfoService equipmentInfoService;
/**
* 添加规格表页面
*
@ -97,6 +101,7 @@ public class EquipmentSpecsController {
equipmentSpecs.setGmtCreate(equipmentSpecs.getGmtCreate());
equipmentSpecs.setGmtModified(new Date());
equipmentSpecsService.updateEquipmentSpecsById(equipmentSpecs);
equipmentInfoService.updateCoverEquipmentInfoBySpecsId(equipmentSpecs.getId(), equipmentSpecs.getSpecs());
return R.ok("编辑成功");
}

6
src/main/java/com/lz/modules/equipment/controller/EquipmentTypeController.java
View File

@ -6,6 +6,7 @@ import com.lz.common.utils.R;
import com.lz.modules.app.utils.BeanUtils;
import com.lz.modules.equipment.entity.EquipmentType;
import com.lz.modules.equipment.entity.EquipmentTypeReq;
import com.lz.modules.equipment.service.IEquipmentInfoService;
import com.lz.modules.equipment.service.IEquipmentTypeService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@ -29,6 +30,9 @@ public class EquipmentTypeController {
@Resource
private IEquipmentTypeService equipmentTypeService;
@Resource
private IEquipmentInfoService equipmentInfoService;
/**
* 添加类型表页面
@ -79,6 +83,8 @@ public class EquipmentTypeController {
EquipmentType equipmentType = equipmentTypeService.selectEquipmentTypeById(req.getId());
BeanUtils.copyProperty(equipmentType,req,true);
equipmentTypeService.updateEquipmentTypeById(equipmentType);
//更新所有再记录中所有的类型名称
equipmentInfoService.updateCoverEquipmentInfoByTypeId(equipmentType.getId(), equipmentType.getType());
return R.ok("编辑成功");
}

4
src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java
View File

@ -54,4 +54,8 @@ public interface EquipmentInfoMapper extends BaseMapper<EquipmentInfo> {
int selectCountByNotFind(@Param("num") Integer num);
int selectCountAllDepartment(@Param("num") Integer num);
int updateCoverEquipmentInfoByTypeId(@Param("id") Long id, @Param("type") String type);
int updateCoverEquipmentInfoByBrandId(@Param("id") Long id, @Param("brand") String brand);
int updateCoverEquipmentInfoBySpecsId(@Param("id") Long id, @Param("specs") String specs);
}

34
src/main/java/com/lz/modules/equipment/entity/EquipmentInfo.java
View File

@ -67,6 +67,13 @@ public class EquipmentInfo implements java.io.Serializable {
private Long saiId;
//第几次盘点
private Integer count;
//类型id
private Long typeId;
//品牌id
private Long brandId;
//规格id
private Long specsId;
/**
* 主键id
* @return
@ -427,6 +434,30 @@ public class EquipmentInfo implements java.io.Serializable {
this.count = count;
}
public Long getTypeId() {
return typeId;
}
public void setTypeId(Long typeId) {
this.typeId = typeId;
}
public Long getBrandId() {
return brandId;
}
public void setBrandId(Long brandId) {
this.brandId = brandId;
}
public Long getSpecsId() {
return specsId;
}
public void setSpecsId(Long specsId) {
this.specsId = specsId;
}
@Override
public String toString() {
return "EquipmentInfo{" +
@ -454,6 +485,9 @@ public class EquipmentInfo implements java.io.Serializable {
",userId=" + userId +
",saiId=" + saiId +
",count=" + count +
",typeId=" + typeId +
",brandId=" + brandId +
",specsId=" + specsId +
"}";
}
}

6
src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java
View File

@ -61,4 +61,10 @@ public interface IEquipmentInfoService extends IService<EquipmentInfo> {
int selectCountByNotFind(Integer num);
int selectCountAllDepartment(int num);
int updateCoverEquipmentInfoByTypeId(Long id, String type);
int updateCoverEquipmentInfoByBrandId(Long id, String brand);
int updateCoverEquipmentInfoBySpecsId(Long id, String specs);
}

21
src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
View File

@ -108,13 +108,13 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
EquipmentBrand equipmentBrand = equipmentBrandMapper.selectEquipmentBrandById(dto.getBrandId());
EquipmentSpecs equipmentSpecs = equipmentSpecsMapper.selectEquipmentSpecsById(dto.getSpecId());
if(equipmentType==null){
throw new ZSException("设备类型错误");
throw new ZSException("设备类型错误，不存在或被删除");
}
if(equipmentBrand==null){
throw new ZSException("设备品牌错误");
throw new ZSException("设备品牌错误，不存在或被删除");
}
if(equipmentSpecs==null){
throw new ZSException("设备规格错误");
throw new ZSException("设备规格错误，不存在或被删除");
}
EquipmentInfo info = equipmentInfoMapper.selectEquipmentInfoById(dto.getId());
@ -302,4 +302,19 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
public int selectCountAllDepartment(int num) {
return equipmentInfoMapper.selectCountAllDepartment(num);
}
@Override
public int updateCoverEquipmentInfoByTypeId(Long id, String type){
return equipmentInfoMapper.updateCoverEquipmentInfoByTypeId(id, type);
}
@Override
public int updateCoverEquipmentInfoByBrandId(Long id, String brand){
return equipmentInfoMapper.updateCoverEquipmentInfoByBrandId(id, brand);
}
@Override
public int updateCoverEquipmentInfoBySpecsId(Long id, String specs){
return equipmentInfoMapper.updateCoverEquipmentInfoBySpecsId(id, specs);
}
}

2
src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
View File

@ -40,6 +40,8 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
int deleteResultRecordById(@Param("id") Long id);
int deleteResultRecordById2(@Param("id") Long id);
List<ResultRecord> selectByCondition(@Param("page") IPage page, @Param("req") ResultRecordReq req);

1
src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
View File

@ -45,6 +45,7 @@ public interface ResultRecordService extends IService<ResultRecord> {
int deleteResultRecordById(Long id);
int deleteResultRecordById2(Long id);
R queryPage(ResultRecordReq params, SysUserEntity user);

7
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -150,6 +150,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return resultRecordMapper.deleteResultRecordById(id);
}
@Override
public int deleteResultRecordById2(Long id) {
return resultRecordMapper.deleteResultRecordById2(id);
}
@Override
public R queryPage(ResultRecordReq params, SysUserEntity user) {
List<String> departmentIds = new ArrayList<>();
@ -353,7 +358,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
resultRecordOld.setFlowStaffIdRole(resultDetailService.initRole(resultRecordOld.getStaffId(), roleId));
resultRecordService.insertResultRecord(resultRecordOld);
//删除月初目标
resultRecordService.deleteResultRecordById(oldResultRecordId);
resultRecordService.deleteResultRecordById2(oldResultRecordId);
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(oldResultRecordId);
for(FlowRecord flowRecord : flowRecords){
flowRecord.setRecordId(resultRecordOld.getId());

6
src/main/resources/mapper/app/ResultRecordMapper.xml
View File

@ -135,6 +135,12 @@
</update>
<update id="deleteResultRecordById2" parameterType="java.lang.Long">
update lz_result_record set is_delete = 2 where id=#{id} limit 1
</update>
<select id="selectByCondition" resultType="com.lz.modules.sys.entity.app.ResultRecord">

29
src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
View File

@ -28,12 +28,15 @@
<result column="user_id" property="userId"/>
<result column="sai_id" property="saiId"/>
<result column="count" property="count"/>
<result column="type_id" property="typeId"/>
<result column="brand_id" property="brandId"/>
<result column="specs_di" property="specsId"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, brand_name AS brandName, spec_type AS specType, type AS type, num AS num, unit AS unit, user AS user, owner AS owner, qr AS qr, original_code AS originalCode, code AS code, mark AS mark, gmt_outbound AS gmtOutbound, gmt_inbound AS gmtInbound, equipment_state AS equipmentState, buy_amount AS buyAmount, sale_amount AS saleAmount, no AS no, user_id AS userId, sai_id AS saiId, count AS count
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, brand_name AS brandName, spec_type AS specType, type AS type, num AS num, unit AS unit, user AS user, owner AS owner, qr AS qr, original_code AS originalCode, code AS code, mark AS mark, gmt_outbound AS gmtOutbound, gmt_inbound AS gmtInbound, equipment_state AS equipmentState, buy_amount AS buyAmount, sale_amount AS saleAmount, no AS no, user_id AS userId, sai_id AS saiId, count AS count, type_id AS typeId, brand_id AS brandId, specs_id AS specsId
</sql>
@ -65,6 +68,9 @@
<if test="no != null">no, </if>
<if test="userId != null">user_id, </if>
<if test="saiId != null">sai_id, </if>
<if test="typeId != null">type_id, </if>
<if test="brandId != null">brand_id, </if>
<if test="specsId != null">specs_id, </if>
<if test="count != null">count, </if>
is_delete,
gmt_create,
@ -89,6 +95,9 @@
<if test="no != null">#{ no}, </if>
<if test="userId != null">#{ userId}, </if>
<if test="saiId != null">#{ saiId}, </if>
<if test="typeId != null">#{typeId}, </if>
<if test="brandId != null">#{brandId}, </if>
<if test="specsId != null">#{specsId]}, </if>
<if test="count != null">#{ count}, </if>
0,
now(),
@ -122,6 +131,9 @@
<if test="no != null">no = #{no},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="saiId != null">sai_id = #{saiId},</if>
<if test="typeId != null">type_id=#{typeId}, </if>
<if test="brandId != null">brand_id=#{brandId}, </if>
<if test="specsId != null">specs_id=#{specsId]}, </if>
<if test="count != null">count = #{count}</if>
</trim>
,gmt_modified = now()
@ -154,6 +166,9 @@
no = #{no},
user_id = #{userId},
sai_id = #{saiId},
type_id=#{typeId},
brand_id=#{brandId},
specs_id=#{specsId},
count = #{count}
,gmt_modified = now()
where id = #{id}
@ -278,5 +293,17 @@
select ifnull(count(*),0) from equipment_info where is_delete = 0 and count =#{num} and depart_id is not null and depart_id > 0
</select>
<update id="updateCoverEquipmentInfoByTypeId" >
update equipment_info set type = #{type} where type_id=#{id} and is_delete=0
</update>
<update id="updateCoverEquipmentInfoByBrandId" >
update equipment_info set brand_name = #{brand} where brand_id=#{id} and is_delete=0
</update>
<update id="updateCoverEquipmentInfoBySpecsId" >
update equipment_info set spec_type = #{specs} where specs_id=#{id} and is_delete=0
</update>
</mapper>