kangwei: 招采相关修改需求及问题

康伟
sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpSettlementController.java
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseAnalysisController.java
sk-module-biz/src/main/java/com/skua/modules/erp/entity/ErpSettlement.java
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINArrivalRecordVO.java
sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java
sk-module-system/src/main/java/com/skua/modules/system/service/SmsService.java
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpSettlementController.java
查看文件 @d2f8458
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpSettlementController.java
查看文件 @d2f8458
@@ -66,6 +66,9 @@ public class ErpSettlementController {
 		}
 		//结算类型
 		queryWrapper.eq("settlement_type" ,erpSettlement.getSettlementType()) ;
+		//根据角色限制列表
 		/*String startDate = req.getParameter("startDate");
 		if(StringUtils.isNotEmpty(startDate)){
 			startDate = startDate+" 00:00:00";
@@ -273,12 +276,12 @@ public class ErpSettlementController {
 	@AutoLog(value = "药剂结算单详情-验收审批")
 	@ApiOperation(value="药剂结算单详情-验收审批", notes="药剂结算单详情-验收审批")
 	@GetMapping(value = "/auditAccept")
-	public Result<?> auditAccept(@RequestParam(name="id",required=true) String id,Integer auditStatus ,String approveMessage ) {
+	public Result<?> auditAccept(@RequestParam(name="id",required=true) String id ) {
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		erpSettlementEntity.setInspectTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
-		erpSettlementEntity.setAuditStatus(auditStatus);
+		erpSettlementEntity.setAuditStatus(2);
-		erpSettlementEntity.setApproveMessage(approveMessage);
+		//erpSettlementEntity.setApproveMessage(approveMessage);
 		erpSettlementEntity.setInspectorSign(BaseContextHandler.getUserName());
 		if(erpSettlementEntity==null) {
 			result.error500("未找到对应实体");
@@ -294,13 +297,13 @@ public class ErpSettlementController {
 	@AutoLog(value = "药剂结算单详情-经理审批")
 	@ApiOperation(value="药剂结算单详情-经理审批", notes="药剂结算单详情-经理审批")
 	@GetMapping(value = "/auditManager")
-	public Result<?> auditManager(@RequestParam(name="id",required=true) String id,Integer auditStatus ,String approveMessage ) {
+	public Result<?> auditManager(@RequestParam(name="id",required=true) String id ) {
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
 		erpSettlementEntity.setApproveTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setApproverSign(BaseContextHandler.getUserName());
-		erpSettlementEntity.setAuditStatus(auditStatus);
+		erpSettlementEntity.setAuditStatus(3);
-		erpSettlementEntity.setApproveMessage(approveMessage);
+		//erpSettlementEntity.setApproveMessage(approveMessage);
 		if(erpSettlementEntity==null) {
 			result.error500("未找到对应实体");
 		}else {
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseAnalysisController.java
查看文件 @d2f8458
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseAnalysisController.java
查看文件 @d2f8458
@@ -7,6 +7,7 @@ import com.skua.core.context.SpringContextUtils;
 import com.skua.core.query.QueryGenerator;
 import com.skua.modules.erp.entity.MaterialIN;
 import com.skua.modules.erp.vo.PurchaseAnalysisVO;
+import com.skua.tool.util.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -31,11 +32,14 @@ public class PurchaseAnalysisController {
    public Result<PurchaseAnalysisVO> settlementList(String startDate,String endDate) {
        Result<PurchaseAnalysisVO> result = new Result<PurchaseAnalysisVO>();
+        int  year = DateUtils.getDateYear(startDate);
+        startDate = year+"-01-01";
+        endDate = year+"-12-31";
        String drugStorage = getJdbcTemplate().queryForObject("select round(ifnull(sum(material_num),0),2)  from erp_material_in where audit_status = '3' and arrive_time >='"+startDate+"' and arrive_time <= '"+endDate+"'",String.class);
        String purchaseMoney = getJdbcTemplate().queryForObject("select   round(ifnull(sum(purchase_money),0),2) from erp_purchase_contract where  use_flag = 0 and  status = 3 and    project_time >='"+startDate+"' and project_time <= '"+endDate+"'",String.class);
-        String distributMoney = getJdbcTemplate().queryForObject("select   round(ifnull(sum(distribut_money),0),2) from erp_distribut_contract where   status = 3 and   purchase_time >='"+startDate+"' and purchase_time <= '"+endDate+"' ",String.class);
+        String distributMoney = getJdbcTemplate().queryForObject("select   round(ifnull(sum(distribut_money),0),2) from erp_distribut_contract where    purchase_time >='"+startDate+"' and purchase_time <= '"+endDate+"' ",String.class);
-        String supplierMoneyByJs = getJdbcTemplate().queryForObject("select round(ifnull(sum(t.total_price_tax),0),2)  from erp_settlement t  where t.settlement_type =  '0' and  t.status = '1' and settlement_time >='"+startDate+"' and settlement_time<='"+endDate+"' ",String.class);
+        String supplierMoneyByJs = getJdbcTemplate().queryForObject("select round(ifnull(sum(t.total_price_tax),0),2)  from erp_settlement t  where t.settlement_type =  '0' and settlement_time >='"+startDate+"' and settlement_time<='"+endDate+"' ",String.class);
-        String waterDepartMoneyByJs = getJdbcTemplate().queryForObject("select round(ifnull(sum(t.total_price_tax),0),2)  from erp_settlement t  where t.settlement_type =  '1' and  t.status = '1'  and settlement_time >='"+startDate+"' and settlement_time<='"+endDate+"' ",String.class);
+        String waterDepartMoneyByJs = getJdbcTemplate().queryForObject("select round(ifnull(sum(t.total_price_tax),0),2)  from erp_settlement t  where t.settlement_type =  '1'   and settlement_time >='"+startDate+"' and settlement_time<='"+endDate+"' ",String.class);
        PurchaseAnalysisVO purchaseAnalysisVO = new PurchaseAnalysisVO( drugStorage,  purchaseMoney,  distributMoney,  supplierMoneyByJs,  waterDepartMoneyByJs);
        result.setSuccess(true);
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/entity/ErpSettlement.java
查看文件 @d2f8458
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/entity/ErpSettlement.java
查看文件 @d2f8458
@@ -62,7 +62,7 @@ public class ErpSettlement {
 	private String totalPriceTax;
 	/**签字状态(1-申请,2-验收签字,3-经理签字)*/
 	@Excel(name = "签字状态(1-申请,2-验收签字,3-经理签字)", width = 15)
-    @ApiModelProperty(value = "审批状态(1-申请,2-验收签字,3-经理签字,4 验收驳回，5 经理驳回)")
+    @ApiModelProperty(value = "审批状态(1-申请,2-验收签字,3-经理签字,-2 验收驳回，-3 经理驳回)")
 	private Integer auditStatus;
 	/**结算状态(0 未结算  1 已结算)*/
 	@Excel(name = "结算状态(0 未结算  1 已结算)", width = 15)
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
查看文件 @d2f8458
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
查看文件 @d2f8458
@@ -64,6 +64,7 @@
    <select id="queryById" resultType="com.skua.modules.erp.vo.MaterialINVO">
           select d.depart_name  'departName', ss.sparepart_code, st.item_text as 'sparepart_type_name',sm.supp_name  as 'supplier_name',ss.sparepart_name, ss.specification,ss.measuring_unit,
+            pm.unit_price 'purchasePrice',
           round(pm.unit_price * t.material_num,2) 'purchaseTotalPrice', round(dm.distribut_price * t.material_num,2) 'distributTotalPrice' ,round(dm.distribut_price * t.material_num ,2)'total_price',
           dm.tax_amount,dm.distribut_price,t.distribut_material_id,t.sparepart_type,t.in_warehouse_id,
           t.id,t.depart_id,t.project_name,t.in_order,t.purchase_contract_id,t.purchase_contract_code,t.distribut_contract_id,t.distribut_contract_code,t.arrive_time,t.receiver,t.sparepart_id,t.material_num,t.supplier_id,t.good_code,t.share_url,t.confirm_status,t.audit_status,t.approve_message,t.in_type
@@ -80,6 +81,7 @@
    <select id="arrivalRecordList" resultType="com.skua.modules.erp.vo.MaterialINVO">
        select d.depart_name  'departName', ss.sparepart_code, st.item_text as 'sparepart_type_name',sm.supp_name  as 'supplier_name',ss.sparepart_name, ss.specification,ss.measuring_unit,
+        pm.unit_price 'purchasePrice',
        round(pm.unit_price * t.material_num,2) 'purchaseTotalPrice', round(dm.distribut_price * t.material_num,2) 'distributTotalPrice' ,round(dm.distribut_price * t.material_num ,2)'total_price',
        dm.tax_amount,dm.distribut_price,t.distribut_material_id,t.sparepart_type,t.in_warehouse_id,
        t.id,t.depart_id,t.project_name,t.in_order,t.purchase_contract_id,t.purchase_contract_code,t.distribut_contract_id,t.distribut_contract_code,t.arrive_time,t.receiver,t.sparepart_id,t.material_num,t.supplier_id,t.good_code,t.share_url,t.confirm_status,t.audit_status,t.approve_message,t.in_type
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
查看文件 @d2f8458
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
查看文件 @d2f8458
@@ -279,7 +279,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
            materialIN.setMaterialNum(purchaseMaterialVO.getMaterialNum());
            materialIN.setSparepartId(purchaseMaterialVO.getSparepartId());
+            materialIN.setSparepartName(purchaseMaterialVO.getSparepartName());
            materialIN.setSparepartType(purchaseMaterialVO.getSparepartType());
            materialIN.setGoodCode(purchaseMaterialVO.getGoodCode());
            materialIN.setSupplierId(purchaseMaterialVO.getSupplierId());
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINArrivalRecordVO.java
查看文件 @d2f8458
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINArrivalRecordVO.java
查看文件 @d2f8458
@@ -29,7 +29,7 @@ public class MaterialINArrivalRecordVO {
    @ApiModelProperty(value = "到货时间")
    private String arriveTime;
-    @Excel(name = "使用单位", width = 15,orderNum = "3",dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
+    @Excel(name = "使用单位", width = 25,orderNum = "3",dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
    @ApiModelProperty(value = "所属机构")
    @Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
    private String departId;
@@ -46,7 +46,7 @@ public class MaterialINArrivalRecordVO {
    @ApiModelProperty(value = "数量")
    private String materialNum;
-    @Excel(name = "供货单位", width = 15,orderNum = "7",dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
+    @Excel(name = "供货单位", width = 30,orderNum = "7",dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
    @ApiModelProperty(value = "供应商编号")
    @Dict(dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
    private String supplierId;
@@ -63,9 +63,11 @@ public class MaterialINArrivalRecordVO {
    @Dict(dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code")
    private String distributContractId;
    /**采购单价*/
+    @Excel(name = "采购单价", width = 15,orderNum = "10")
    @ApiModelProperty(value = "采购单价")
    private String purchasePrice;
    /**分销单价*/
+    @Excel(name = "分销单价", width = 15,orderNum = "10")
    @ApiModelProperty(value = "分销单价")
    private String distributPrice;
    /**采购总价*/
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java
查看文件 @d2f8458
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java
查看文件 @d2f8458
@@ -67,6 +67,7 @@ public class MaterialINVO   extends MaterialIN {
    /**采购总价*/
    @TableField(exist = false)
    @ApiModelProperty(value = "采购总价")
+    @Excel(name = "采购总价", width = 15)
    private String purchaseTotalPrice;
    /**价税合计*/
    @TableField(exist = false)
@@ -77,14 +78,6 @@ public class MaterialINVO   extends MaterialIN {
    private List<PurchaseMaterialVO>  materiaList;
-    public String getPurchaseTotalPrice() {
-        if(StringUtils.isNotEmpty(this.getPurchasePrice()) && StringUtils.isNotEmpty(this.getMaterialNum())){
-            purchaseTotalPrice = JSUtils.multiply(purchasePrice ,this.getMaterialNum())  ;
-        }
-        return purchaseTotalPrice;
-    }
    public String getTotalPriceTax() {
        //不含税总价 = 含税总价 / (1 + 税率)
        if(StringUtils.isNotEmpty(this.getTaxAmount()) && StringUtils.isNotEmpty(this.getDistributPrice()) && StringUtils.isNotEmpty(this.getMaterialNum())){
--- a/sk-module-system/src/main/java/com/skua/modules/system/service/SmsService.java
查看文件 @d2f8458
+++ b/sk-module-system/src/main/java/com/skua/modules/system/service/SmsService.java
查看文件 @d2f8458
@@ -27,9 +27,11 @@ public class SmsService {
    public void pushMsgNoProcessByRoleId(String messageTitle ,String messageBody  ,String roleId,String forwardTag,String msgCategory){
        if(StringUtils.isNotEmpty(roleId)){
            List<SysUser> sysUserList = userService.queryUserByRoleId(roleId);
+            if(sysUserList != null && !sysUserList.isEmpty()){
                pushMessage(sysUserList,messageTitle , messageBody  , forwardTag,msgCategory);
            }
        }
+    }
    /***
     * 信息推送：包含手机，web推送
@@ -73,6 +75,7 @@ public class SmsService {
    public void appPushMsgNoProcess(String messageTitle ,String messageBody  ,String userIds,String forwardTag){
        if(StringUtils.isNotEmpty(userIds)){
            List<SysUser> sysUserList = userService.getUserByUserIds(userIds);
+            if(sysUserList != null && !sysUserList.isEmpty()){
                List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList());
                MessageEntity messageEntity = new MessageEntity();
@@ -86,6 +89,7 @@ public class SmsService {
                appPushService.pushMessage(messageEntity);
            }
        }
+    }
    /***
     *  web推送
@@ -97,9 +101,9 @@ public class SmsService {
    public void webPushMsgNoProcess(String messageTitle ,String messageBody  ,String userIds,String forwardTag,String msgCategory){
        if(StringUtils.isNotEmpty(userIds)){
            List<SysUser> sysUserList = userService.getUserByUserIds(userIds);
-            List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList());
+            //List<String> userCidList = sysUserList.stream().map(SysUser::getCid).filter(v -> StringUtils.isNotBlank(v)).collect(Collectors.toList());
+            if(sysUserList != null && !sysUserList.isEmpty()){
                List<String> userIdList = sysUserList.stream().map(SysUser::getId).collect(Collectors.toList());
                MessageEntity messageEntity = new MessageEntity();
                messageEntity.setMessageTitle(messageTitle);
                messageEntity.setMessageBody(messageBody);
@@ -109,5 +113,7 @@ public class SmsService {
                webNoticePushServiceExt.pushMessage(messageEntity,msgCategory);
            }
+        }
    }
 }