Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
a809e057 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 3b4f6593 d442111a
全部展开
内嵌 并排
正在显示 31 个修改的文件 包含 371 行增加 和 83 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhWasteGasController.java
......@@ -66,17 +66,27 @@ public class AjhWasteGasController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<AjhWasteGas>> result = new Result<IPage<AjhWasteGas>>();
String departIds = null;
/*String departIds = null;
if(StringUtils.isNotEmpty(ajhWasteGas.getDepartId())){
departIds = commonSqlService.getChildDepartId(ajhWasteGas.getDepartId());
ajhWasteGas.setDepartId(null);
}
}*/
QueryWrapper<AjhWasteGas> queryWrapper = QueryGenerator.initQueryWrapper(ajhWasteGas, req.getParameterMap());
Page<AjhWasteGas> page = new Page<AjhWasteGas>(pageNo, pageSize);
if(StringUtils.isNotEmpty(departIds)){
/*if(StringUtils.isNotEmpty(departIds)){
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
}*/
//时间字段查询
String startDate = req.getParameter("startDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.ge("create_time",startDate+" 00:00:00");
}
String endDate = req.getParameter("endDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.le("create_time",endDate+" 23:59:59");
}
IPage<AjhWasteGas> pageList = ajhWasteGasService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhWasteNoiseController.java
......@@ -81,14 +81,25 @@ public class AjhWasteNoiseController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<AjhWasteNoise>> result = new Result<IPage<AjhWasteNoise>>();
String departIds = null;
/* String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(ajhWasteNoise.getDepartId())){
departIds = commonSqlService.getChildDepartId(ajhWasteNoise.getDepartId());
ajhWasteNoise.setDepartId(null);
}
}*/
QueryWrapper<AjhWasteNoise> queryWrapper = QueryGenerator.initQueryWrapper(ajhWasteNoise, req.getParameterMap());
Page<AjhWasteNoise> page = new Page<AjhWasteNoise>(pageNo, pageSize);
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
/*if(StringUtils.isNotEmpty(departIds)){
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
}*/
String startDate = req.getParameter("startDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.ge("create_time",startDate+" 00:00:00");
}
String endDate = req.getParameter("endDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.le("create_time",endDate+" 23:59:59");
}
IPage<AjhWasteNoise> pageList = ajhWasteNoiseService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhWasteSolidContractController.java
......@@ -81,14 +81,25 @@ public class AjhWasteSolidContractController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<AjhWasteSolidContract>> result = new Result<IPage<AjhWasteSolidContract>>();
String departIds = null;
/*String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(ajhWasteSolidContract.getDepartId())){
departIds = commonSqlService.getChildDepartId(ajhWasteSolidContract.getDepartId());
ajhWasteSolidContract.setDepartId(null);
}
}*/
QueryWrapper<AjhWasteSolidContract> queryWrapper = QueryGenerator.initQueryWrapper(ajhWasteSolidContract, req.getParameterMap());
Page<AjhWasteSolidContract> page = new Page<AjhWasteSolidContract>(pageNo, pageSize);
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
/*if(StringUtils.isNotEmpty(departIds)){
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
}*/
String startDate = req.getParameter("startDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.ge("create_time",startDate+" 00:00:00");
}
String endDate = req.getParameter("endDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.le("create_time",endDate+" 23:59:59");
}
IPage<AjhWasteSolidContract> pageList = ajhWasteSolidContractService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhWasteSolidPermitController.java
......@@ -81,14 +81,24 @@ public class AjhWasteSolidPermitController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<AjhWasteSolidPermit>> result = new Result<IPage<AjhWasteSolidPermit>>();
String departIds = null;
/*String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(ajhWasteSolidPermit.getDepartId())){
departIds = commonSqlService.getChildDepartId(ajhWasteSolidPermit.getDepartId());
ajhWasteSolidPermit.setDepartId(null);
}
}*/
QueryWrapper<AjhWasteSolidPermit> queryWrapper = QueryGenerator.initQueryWrapper(ajhWasteSolidPermit, req.getParameterMap());
Page<AjhWasteSolidPermit> page = new Page<AjhWasteSolidPermit>(pageNo, pageSize);
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
/*if(StringUtils.isNotEmpty(departIds)){
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
}*/
String startDate = req.getParameter("startDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.ge("create_time",startDate+" 00:00:00");
}
String endDate = req.getParameter("endDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.le("create_time",endDate+" 23:59:59");
}
IPage<AjhWasteSolidPermit> pageList = ajhWasteSolidPermitService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhWasteSolidReportController.java
......@@ -81,14 +81,24 @@ public class AjhWasteSolidReportController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<AjhWasteSolidReport>> result = new Result<IPage<AjhWasteSolidReport>>();
String departIds = null;
/*String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(ajhWasteSolidReport.getDepartId())){
departIds = commonSqlService.getChildDepartId(ajhWasteSolidReport.getDepartId());
ajhWasteSolidReport.setDepartId(null);
}
}*/
QueryWrapper<AjhWasteSolidReport> queryWrapper = QueryGenerator.initQueryWrapper(ajhWasteSolidReport, req.getParameterMap());
Page<AjhWasteSolidReport> page = new Page<AjhWasteSolidReport>(pageNo, pageSize);
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
/*if(StringUtils.isNotEmpty(departIds)){
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
}*/
String startDate = req.getParameter("startDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.ge("create_time",startDate+" 00:00:00");
}
String endDate = req.getParameter("endDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.le("create_time",endDate+" 23:59:59");
}
IPage<AjhWasteSolidReport> pageList = ajhWasteSolidReportService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhWasteSolidTransportController.java
......@@ -81,14 +81,24 @@ public class AjhWasteSolidTransportController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<AjhWasteSolidTransport>> result = new Result<IPage<AjhWasteSolidTransport>>();
String departIds = null;
/*String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(ajhWasteSolidTransport.getDepartId())){
departIds = commonSqlService.getChildDepartId(ajhWasteSolidTransport.getDepartId());
ajhWasteSolidTransport.setDepartId(null);
}
}*/
QueryWrapper<AjhWasteSolidTransport> queryWrapper = QueryGenerator.initQueryWrapper(ajhWasteSolidTransport, req.getParameterMap());
Page<AjhWasteSolidTransport> page = new Page<AjhWasteSolidTransport>(pageNo, pageSize);
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
/*if(StringUtils.isNotEmpty(departIds)){
queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
}*/
String startDate = req.getParameter("startDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.ge("create_time",startDate+" 00:00:00");
}
String endDate = req.getParameter("endDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.le("create_time",endDate+" 23:59:59");
}
IPage<AjhWasteSolidTransport> pageList = ajhWasteSolidTransportService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/LeaderInspectionRecordController.java
......@@ -77,16 +77,23 @@ public class LeaderInspectionRecordController {
HttpServletRequest req) {
Result<IPage<LeaderInspectionRecord>> result = new Result<IPage<LeaderInspectionRecord>>();
String departIds = null;
if (StringUtils.isEmpty(leaderInspectionRecord.getDepartId())) {
departIds = BaseContextHandler.getDeparts();
}else{
/*String departIds = BaseContextHandler.getDeparts();
if (StringUtils.isNotEmpty(leaderInspectionRecord.getDepartId())) {
departIds = departService.getChildDepartId(leaderInspectionRecord.getDepartId());
leaderInspectionRecord.setDepartId(null);
}
}*/
QueryWrapper<LeaderInspectionRecord> queryWrapper = QueryGenerator.initQueryWrapper(leaderInspectionRecord, req.getParameterMap());
Page<LeaderInspectionRecord> page = new Page<LeaderInspectionRecord>(pageNo, pageSize);
queryWrapper.in("depart_id" , departIds) ;
/*queryWrapper.in("depart_id" , departIds) ;*/
String startDate = req.getParameter("startDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.ge("create_time",startDate+" 00:00:00");
}
String endDate = req.getParameter("endDate");
if(StringUtils.isNotEmpty(startDate)){
queryWrapper.le("create_time",endDate+" 23:59:59");
}
IPage<LeaderInspectionRecord> pageList = leaderInspectionRecordService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhWasteSolidContract.java
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -29,17 +30,18 @@ public class AjhWasteSolidContract {
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "报警ID 主键")
private String id;
/**处理单位*/
@Excel(name = "处理单位", width = 15)
@ApiModelProperty(value = "处理单位")
@Excel(name = "水厂编号", width = 15)
@ApiModelProperty(value = "水厂编号")
private String departId;
/**水厂名称*/
@Excel(name = "水厂名称", width = 15)
@ApiModelProperty(value = "水厂名称")
private String departName;
/**处理单位*/
@Excel(name = "处理单位", width = 15)
@ApiModelProperty(value = "处理单位")
@Dict(dictTable = "ajh_safe_handle_point", dicCode="id", dicText = "company_name")
private String handleDepartName;
/**合同签订时间*/
@Excel(name = "合同签订时间", width = 15)
......@@ -65,6 +67,9 @@ public class AjhWasteSolidContract {
@Excel(name = "联系电话", width = 15)
@ApiModelProperty(value = "联系电话")
private String contactsPhone;
@ApiModelProperty(value = "合同文件")
private String contractFile;
/**创建人id*/
@Excel(name = "创建人id", width = 15)
@ApiModelProperty(value = "创建人id")
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhWasteSolidTransport.java
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -29,17 +30,19 @@ public class AjhWasteSolidTransport {
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "报警ID 主键")
private String id;
/**处理单位*/
@Excel(name = "处理单位", width = 15)
@ApiModelProperty(value = "处理单位")
@Excel(name = "水厂编号", width = 15)
@ApiModelProperty(value = "水厂编号")
private String departId;
/**水厂名称*/
@Excel(name = "水厂名称", width = 15)
@ApiModelProperty(value = "水厂名称")
private String departName;
/**处理单位*/
@Excel(name = "处理单位", width = 15)
@ApiModelProperty(value = "处理单位")
@Dict(dictTable = "ajh_safe_handle_point", dicCode="id", dicText = "company_name")
private String handleDepartName;
/**车牌号*/
@Excel(name = "车牌号", width = 15)
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/DistributContractController.java
......@@ -23,6 +23,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.erp.service.IDistributMaterialService;
import com.skua.modules.erp.service.IPurchaseMaterialService;
import com.skua.modules.erp.vo.DistributContractVO;
import com.skua.modules.erp.vo.PurchaseContractVO;
......@@ -53,6 +54,8 @@ public class DistributContractController {
@Autowired
private IDistributContractService distributContractService;
@Autowired
private IDistributMaterialService distributMaterialService;
@Autowired
private IPurchaseMaterialService purchaseMaterialService ;
@AutoLog(value = "erp分销合同-分页列表查询")
......@@ -66,9 +69,9 @@ public class DistributContractController {
QueryWrapper<DistributContract> queryWrapper = QueryGenerator.initQueryWrapper(distributContract, req.getParameterMap());
Page<DistributContract> page = new Page<DistributContract>(pageNo, pageSize);
//启用状态：=0
if(StringUtils.isEmpty(distributContract.getUseFlag())){
/*if(StringUtils.isEmpty(distributContract.getUseFlag())){
queryWrapper.eq("use_flag","0");
}
}*/
IPage<DistributContract> pageList = distributContractService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
......@@ -84,15 +87,16 @@ public class DistributContractController {
Result<List<DistributContract>> result = new Result<List<DistributContract>>();
QueryWrapper<DistributContract> queryWrapper = QueryGenerator.initQueryWrapper(distributContract, req.getParameterMap());
// 需要添加条件判断
String use_flag = "0";
//String use_flag = "0";
queryWrapper.ge("end_time", DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));// 生效时间 《 当前时间 《 失效时间
queryWrapper.le("start_time", DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
//启用状态：=0
if(StringUtils.isNotEmpty(distributContract.getUseFlag())){
/*if(StringUtils.isNotEmpty(distributContract.getUseFlag())){
use_flag = distributContract.getUseFlag();
}
queryWrapper.eq("use_flag",use_flag);
queryWrapper.eq("use_flag",use_flag);*/
List<DistributContract> dataList = distributContractService.list(queryWrapper);
result.setSuccess(true);
result.setResult(dataList);
......@@ -109,6 +113,7 @@ public class DistributContractController {
result.error500(errMsg);
}else{
distributContractService.saveDistributContractVO(distributContract);
distributMaterialService.changePurchaseContract( distributContract.getId() ,distributContract.getUseFlag() ) ;
result.success("添加成功！");
}
} catch (Exception e) {
......@@ -132,6 +137,7 @@ public class DistributContractController {
result.error500(errMsg);
}else{
distributContractService.updateDistributContractVO(distributContract);
distributMaterialService.changePurchaseContract( distributContract.getId() ,distributContract.getUseFlag() ) ;
result.success("修改成功！");
}
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
......@@ -235,10 +235,7 @@ public class MaterialINController {
public Result<MaterialIN> add(@RequestBody MaterialIN materialIN) {
Result<MaterialIN> result = new Result<MaterialIN>();
try {
materialINService.save(materialIN);
MaterialAcceptanceForm materialAcceptanceForm = new MaterialAcceptanceForm();
materialAcceptanceForm.setId( materialIN.getId() ) ;
materialAcceptanceFormService.save(materialAcceptanceForm);
materialINService.saveMaterialIN(materialIN);
result.success("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(),e);
......@@ -256,11 +253,8 @@ public class MaterialINController {
if(materialINEntity==null) {
result.error500("未找到对应实体");
}else {
boolean ok = materialINService.updateById(materialIN);
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
}
materialINService.updateMaterialIN(materialIN);
result.success("修改成功!");
}
return result;
}
......@@ -297,6 +291,7 @@ public class MaterialINController {
@GetMapping(value = "/queryById")
public Result<MaterialIN> queryById(@RequestParam(name="id",required=true) String id) {
Result<MaterialIN> result = new Result<MaterialIN>();
MaterialIN materialIN = materialINService.getById(id);
EquipmentSparepartType sparepartType = sparepartTypeService.getById(materialIN.getSparepartType());
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseContractController.java
......@@ -36,6 +36,7 @@ public class PurchaseContractController {
@Autowired
private IERPPurchaseContractService purchaseContractService;
@AutoLog(value = "erp统购合同-分页列表查询")
@ApiOperation(value="erp统购合同-分页列表查询", notes="erp统购合同-分页列表查询")
@GetMapping(value = "/list")
......@@ -48,13 +49,13 @@ public class PurchaseContractController {
Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize);
// 需要添加条件判断
if(StringUtils.isEmpty(purchaseContract.getStatus())){
/*if(StringUtils.isEmpty(purchaseContract.getStatus())){
queryWrapper.lt("status" , "3");// >0
}
}*/
//启用状态：=0
if(StringUtils.isEmpty(purchaseContract.getUseFlag())){
/*if(StringUtils.isEmpty(purchaseContract.getUseFlag())){
queryWrapper.eq("use_flag","0");
}
}*/
// 需要添加条件判断
IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper);
result.setSuccess(true);
......@@ -73,10 +74,10 @@ public class PurchaseContractController {
Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize);
// 需要添加条件判断
/*if(StringUtils.isEmpty(purchaseContract.getStatus())){
if(StringUtils.isEmpty(purchaseContract.getStatus())){
queryWrapper.gt("status" , "0");// >0
queryWrapper.ne("status" , "2"); // 不等于2
}*/
}
//启用状态：=0
if(StringUtils.isEmpty(purchaseContract.getUseFlag())){
queryWrapper.eq("use_flag","0");
......@@ -227,12 +228,17 @@ public class PurchaseContractController {
if(purchaseContract==null) {
result.error500("未找到对应实体");
}else {
purchaseContract.setStatus("1");
purchaseContract.setApplyUser(BaseContextHandler.getUserId());
purchaseContract.setApplyTime(DateUtils.now());
purchaseContractService.updateById(purchaseContract);
result.setResult(purchaseContract);
result.setSuccess(true);
if("1".equals(purchaseContract.getUseFlag())){
result.error500("合同状态是：[未启用]，不能提交审核！");
}else{
purchaseContract.setStatus("1");
purchaseContract.setApplyUser(BaseContextHandler.getUserId());
purchaseContract.setApplyTime(DateUtils.now());
purchaseContractService.updateById(purchaseContract);
result.setResult(purchaseContract);
result.setSuccess(true);
}
}
return result;
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/DistributMaterialMapper.java
......@@ -35,7 +35,5 @@ public interface DistributMaterialMapper extends BaseMapper<DistributMaterial> {
* 变更合同
* @param id
*/
void changePurchaseContract( @Param("contractId") String id);
void changePurchaseContract( @Param("contractId") String id ,@Param("delFlag") String delFlag);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/PurchaseMaterialMapper.java
......@@ -79,5 +79,5 @@ public interface PurchaseMaterialMapper extends BaseMapper<PurchaseMaterial> {
* 变更合同
* @param contractId
*/
void changePurchaseContract(@Param("contractId")String contractId);
void changePurchaseContract(@Param("contractId")String contractId ,@Param("delFlag")String delFlag );
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/DistributMaterialMapper.xml
......@@ -32,7 +32,7 @@
<!-- 变更合同-->
<update id="changePurchaseContract">
update erp_distribut_material set del_flag =1 where contract_id = #{contractId}
update erp_distribut_material set del_flag =#{delFlag} where contract_id = #{contractId}
</update>
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/PurchaseMaterialMapper.xml
......@@ -14,7 +14,7 @@
left join equipment_sparepart_supplies ss on m.sparepart_id = ss.id
left join equipment_sparepart_type st on st.id = m.sparepart_type
left join ajh_supplier_manage sm on sm.id = m.supplier_id
where m.contract_id = #{contractId} and m.del_flag = 0
where m.contract_id = #{contractId}
</select>
......@@ -37,16 +37,20 @@
<select id="queryMaterialByGoodCode" resultType="com.skua.modules.erp.entity.PurchaseMaterial">
select st.item_text as 'sparepart_type_name',sm.supp_name as 'supplier_name', pm.*
from erp_purchase_material pm
from (
select m.* from erp_purchase_material m , erp_purchase_contract c
where m.contract_id = c.id and c.status = 3 and c.use_flag = '0'
and m.good_code = #{goodCode} and m.depart_id = #{departId}
) pm
left join equipment_sparepart_type st on st.id = pm.sparepart_type
left join ajh_supplier_manage sm on sm.id = pm.supplier_id
where pm.good_code = #{goodCode} and pm.depart_id = #{departId} and pm.del_flag = 0
</select>
<!-- 校验货号是否唯一 -->
<select id="checkGoodCode" resultType="java.lang.Integer">
select count(1) from erp_purchase_material
where del_flag = 0 and good_code = #{goodCode}
where good_code = #{goodCode}
<if test="id != null and id !=''">and id = #{id}</if>
</select>
<!-- 药剂入库查询结果：物料清单-->
......@@ -56,7 +60,7 @@
from (
select dc.contract_code 'distribut_contract_code', dc.id 'distribut_contract_id', dm.distribut_price ,dm.distribut_total_price,dm.material_num ,pm.*
from erp_distribut_contract dc , erp_distribut_material dm , erp_purchase_material pm
where dc.id = dm.contract_id and dc.id = #{param.distributContractId } and dm.good_code = pm.good_code and pm.del_flag = 0 and dc.use_flag = '0'
where dc.id = dm.contract_id and dc.id = #{param.distributContractId } and dm.good_code = pm.good_code and pm.del_flag = '0' and dc.use_flag = '0' and dm.del_flag = '0' and dc.start_time &gt; now() and dc.end_time &lt; now()
<if test="param.sparepartCode != null and param.sparepartCode !=''">and pm.sparepart_code =#{param.sparepartCode}</if>
<if test="param.sparepartType != null and param.sparepartType !=''">and pm.sparepart_type in (${param.sparepartType}) </if>
<if test="param.sparepartName != null and param.sparepartName !=''">and pm.sparepart_name like '%${param.sparepartName}%'</if>
......@@ -70,7 +74,7 @@
</select>
<!-- 变更合同-->
<update id="changePurchaseContract">
update erp_purchase_material set del_flag=1 where contract_id =#{contractId}
update erp_purchase_material set del_flag=#{delFlag} where contract_id =#{contractId}
</update>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IDistributMaterialService.java
......@@ -8,4 +8,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IDistributMaterialService extends IService<DistributMaterial> {
void changePurchaseContract(String id, String useFlag);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialINService.java
......@@ -34,5 +34,14 @@ public interface IMaterialINService extends IService<MaterialIN> {
*/
public IPage<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, MaterialIN materialIN) ;
/***
* 药剂入库
* @param materialIN
*/
String saveMaterialIN(MaterialIN materialIN);
/***
* 药剂入库
* @param materialIN
*/
String updateMaterialIN(MaterialIN materialIN);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/DistributContractServiceImpl.java
......@@ -145,9 +145,11 @@ public class DistributContractServiceImpl extends ServiceImpl<DistributContractM
@Transactional
public String changePurchaseContract(DistributContractVO distributContractVO){
// 变更合同
baseMapper.changePurchaseContract( distributContractVO.getId() );
materialMapper.changePurchaseContract( distributContractVO.getId() ) ;
distributContractVO.setOldContractId(distributContractVO.getId());//保存变更前的的合同编号
String oldContractId = distributContractVO.getId();
baseMapper.changePurchaseContract( oldContractId);
materialMapper.changePurchaseContract( oldContractId ,"1" ) ;
distributContractVO.setOldContractId(oldContractId);//保存变更前的的合同编号
return this.updateDistributContractVO(distributContractVO);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/DistributMaterialServiceImpl.java
......@@ -13,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class DistributMaterialServiceImpl extends ServiceImpl<DistributMaterialMapper, DistributMaterial> implements IDistributMaterialService {
public void changePurchaseContract(String id, String useFlag){
this.baseMapper.changePurchaseContract(id,useFlag);
}
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/ERPPurchaseContractServiceImpl.java
......@@ -61,7 +61,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
}
}else{
count = purchaseMaterialMapper.checkContractCode(purchaseContractVO.getContractCode() );
if(count > 0 ){
if(count > checkCount ){
result = "合同编号["+purchaseContractVO.getContractCode()+"]重复";
return result;
}
......@@ -151,6 +151,8 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
}
purchaseContractVO.setPurchaseMoney( purchaseMoney );
int count = this.baseMapper.updateById( purchaseContractVO );
purchaseMaterialMapper.changePurchaseContract( purchaseContractVO.getId(),purchaseContractVO.getUseFlag()) ;
return count > 0 ? true :false;
}
/***
......@@ -159,11 +161,12 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
*/
@Transactional
public void changePurchaseContract(PurchaseContractVO purchaseContractVO){
String oldContractId = purchaseContractVO.getId() ;
// 变更合同
baseMapper.changePurchaseContract( purchaseContractVO.getId() );
purchaseMaterialMapper.changePurchaseContract( purchaseContractVO.getId() ) ;
baseMapper.changePurchaseContract(oldContractId );
purchaseMaterialMapper.changePurchaseContract( oldContractId,"1") ;
purchaseContractVO.setOldContractId(purchaseContractVO.getId());
purchaseContractVO.setOldContractId(oldContractId);
purchaseContractVO.setId(null);
this.baseMapper.insert( purchaseContractVO );
//计算采购金额
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.context.SpringContextUtils;
import com.skua.modules.common.service.ICommonSqlService;
import com.skua.modules.equipment.dto.EquipmentInDTO;
import com.skua.modules.equipment.dto.EquipmentOutDTO;
import com.skua.modules.equipment.entity.EquipmentIn;
......@@ -11,18 +12,19 @@ import com.skua.modules.equipment.entity.EquipmentInChild;
import com.skua.modules.equipment.entity.EquipmentOutChild;
import com.skua.modules.equipment.service.IEquipmentInService;
import com.skua.modules.equipment.service.IEquipmentOutService;
import com.skua.modules.erp.entity.ApproveRecord;
import com.skua.modules.erp.entity.ERPPurchaseContract;
import com.skua.modules.erp.entity.MaterialIN;
import com.skua.modules.erp.entity.*;
import com.skua.modules.erp.mapper.ApproveRecordMapper;
import com.skua.modules.erp.mapper.ERPPurchaseContractMapper;
import com.skua.modules.erp.mapper.MaterialINMapper;
import com.skua.modules.erp.service.IERPPurchaseContractService;
import com.skua.modules.erp.service.IMaterialAcceptanceFormService;
import com.skua.modules.erp.service.IMaterialINService;
import com.skua.modules.erp.service.IPurchaseMaterialService;
import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO;
import com.skua.modules.erp.vo.MaterialINVO;
import com.skua.modules.guest.util.DateUtil;
import com.skua.modules.quartz.util.BaseUtil;
import com.skua.modules.supplies.entity.PurchaseContract;
import com.skua.modules.supplies.entity.SuppliesWarehouse;
import com.skua.modules.supplies.service.ISuppliesWarehouseService;
import com.skua.tool.util.DateUtils;
......@@ -50,12 +52,19 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
private ApproveRecordMapper recordMapper;
@Autowired
private IERPPurchaseContractService purchaseContractService;
@Autowired
private IPurchaseMaterialService purchaseMaterialService;
@Autowired
private IEquipmentInService equipmentInService;
@Autowired
private IEquipmentOutService equipmentOutService;
@Autowired
private ISuppliesWarehouseService warehouseService;
@Autowired
private IMaterialAcceptanceFormService materialAcceptanceFormService;//验收单
@Autowired
private ICommonSqlService commonSqlService;
/***
* 审核药剂入库单
......@@ -131,7 +140,39 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
public IPage<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, MaterialIN materialIN) {
return page.setRecords(baseMapper.selectAuditMaterialINByPage(page, materialIN));
}
/***
* 药剂入库
* @param materialIN
*/
@Transactional
public String saveMaterialIN(MaterialIN materialIN){
//根据货号查询统购合同编号
QueryWrapper<PurchaseMaterial> queryWrapper = new QueryWrapper<PurchaseMaterial>();
queryWrapper.eq("good_code",materialIN.getGoodCode());
List<PurchaseMaterial> purchaseMaterialList = purchaseMaterialService.list(queryWrapper);
if(purchaseMaterialList != null && !purchaseMaterialList.isEmpty()){
materialIN.setPurchaseContractId(purchaseMaterialList.get(0).getPurchaseContractId());
materialIN.setSupplierId(purchaseMaterialList.get(0).getSupplierId());
}
this.baseMapper.insert(materialIN);
MaterialAcceptanceForm materialAcceptanceForm = new MaterialAcceptanceForm();
materialAcceptanceForm.setId( materialIN.getId() ) ;
materialAcceptanceFormService.save(materialAcceptanceForm);
return null;
}
@Transactional
public String updateMaterialIN(MaterialIN materialIN){
//根据货号查询统购合同编号
QueryWrapper<PurchaseMaterial> queryWrapper = new QueryWrapper<PurchaseMaterial>();
queryWrapper.eq("good_code",materialIN.getGoodCode());
List<PurchaseMaterial> purchaseMaterialList = purchaseMaterialService.list(queryWrapper);
if(purchaseMaterialList != null && !purchaseMaterialList.isEmpty()){
materialIN.setPurchaseContractId(purchaseMaterialList.get(0).getPurchaseContractId());
materialIN.setSupplierId(purchaseMaterialList.get(0).getSupplierId());
}
this.baseMapper.updateById(materialIN );
return null;
}
/***
* 出库
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/SafeHandlePoint.java 0 → 100644
package com.skua.modules.safe.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 安环处置点
*/
@Data
@TableName("ajh_safe_handle_point")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="ajh_safe_handle_point对象", description="安环处置点")
public class SafeHandlePoint {
/**id*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "id")
private String id;
/**公司名称*/
@Excel(name = "公司名称", width = 15)
@ApiModelProperty(value = "公司名称")
private String companyName;
/**简称*/
@Excel(name = "简称", width = 15)
@ApiModelProperty(value = "简称")
private String nameAbbr;
/**处置方式*/
@Excel(name = "处置方式", width = 15)
@ApiModelProperty(value = "处置方式")
@Dict(dicCode = "safe_handle_type")
private String handleType;
/**日处理能力*/
@Excel(name = "日处理能力", width = 15)
@ApiModelProperty(value = "日处理能力")
private String dayHandleCapacity;
/**合作状态*/
@Excel(name = "合作状态", width = 15)
@ApiModelProperty(value = "合作状态")
@Dict(dicCode = "cooperate_status")
private String status;
/**地址*/
@Excel(name = "地址", width = 15)
@ApiModelProperty(value = "地址")
private String address;
/**附件*/
@Excel(name = "附件", width = 15)
@ApiModelProperty(value = "附件")
private String filePath;
/**录入全国信息系统：0 是 1否*/
@Excel(name = "录入全国信息系统：0 是 1否", width = 15)
@ApiModelProperty(value = "录入全国信息系统：0 是 1否")
private Integer enterSystem;
/**关联合同集合*/
@Excel(name = "关联合同集合", width = 15)
@ApiModelProperty(value = "关联合同集合")
private String contractIds;
/**0未删除1删除*/
@Excel(name = "0未删除1删除", width = 15)
@ApiModelProperty(value = "0未删除1删除")
private Integer delFlag;
/**createTime*/
@Excel(name = "createTime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private Date createTime;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private String createBy;
/**updateBy*/
@Excel(name = "updateBy", width = 15)
@ApiModelProperty(value = "updateBy")
private String updateBy;
/**updateTime*/
@Excel(name = "updateTime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private Date updateTime;
}
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/SafeHandlePointMapper.java 0 → 100644
package com.skua.modules.safe.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.safe.entity.SafeHandlePoint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 安环处置点
*/
public interface SafeHandlePointMapper extends BaseMapper<SafeHandlePoint> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/SafeHandlePointMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.safe.mapper.SafeHandlePointMapper">
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/safe/service/ISafeHandlePointService.java 0 → 100644
package com.skua.modules.safe.service;
import com.skua.modules.safe.entity.SafeHandlePoint;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 安环处置点
*/
public interface ISafeHandlePointService extends IService<SafeHandlePoint> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/SafeHandlePointServiceImpl.java 0 → 100644
package com.skua.modules.safe.service.impl;
import com.skua.modules.safe.entity.SafeHandlePoint;
import com.skua.modules.safe.mapper.SafeHandlePointMapper;
import com.skua.modules.safe.service.ISafeHandlePointService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 安环处置点
*/
@Service
public class SafeHandlePointServiceImpl extends ServiceImpl<SafeHandlePointMapper, SafeHandlePoint> implements ISafeHandlePointService {
}
sk-module-biz/src/main/resources/application-test.yml
......@@ -133,7 +133,7 @@ mybatis-plus:
configuration:
call-setters-on-nulls: true
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#数矿专用配置
skua:
web-url: http://192.168.100.29:3000
......
sk-module-biz/src/main/resources/application.yml
spring:
profiles:
active: prod
active: test
# 信息安全
security:
csrf:
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
......@@ -99,6 +99,10 @@ public class MybatisInterceptor implements Interceptor {
//material_info
add("material_info");
//三废
//add("ajh_waste_gas");
//噪音
// add("ajh_waste_noise");
}};
//过滤不需要走部门ID查询的URL
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!