bonus
/
ahdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
bonus 2024-08-12 15:00:40 +08:00
parent 7831c1ebf5 4dc4acf4f0
commit fa1fcef183
14 changed files with 235 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java
View File

@ -1,5 +1,6 @@
package com.bonus.base.api.domain;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -19,53 +20,73 @@ import lombok.Data;
@Data
public class BmAgreement extends BaseEntity implements Serializable {
@ApiModelProperty(value="")
@ApiModelProperty(value="主键id")
private Integer id;
@ApiModelProperty(value="")
@ApiModelProperty(value="签订日期")
@Excel(name = "协议签订日期")
private String signDate;
@ApiModelProperty(value="协议编号")
@Excel(name = "协议编号")
private String code;
@ApiModelProperty(value="")
private String signDate;
@ApiModelProperty(value="合同编号")
@Excel(name = "合同编号")
private String contractNumber;
@ApiModelProperty(value="单位名称")
@Excel(name = "租赁单位")
private String unitName;
@ApiModelProperty(value="工程名称")
@Excel(name = "租赁工程")
private String projectName;
@ApiModelProperty(value="")
private Integer leaseCompany;
@ApiModelProperty(value="")
@ApiModelProperty(value="工程id")
private Integer project;
@ApiModelProperty(value="")
@ApiModelProperty(value="开始时间")
@Excel(name = "开始日期")
private String startTime;
@ApiModelProperty(value="")
@ApiModelProperty(value="结束时间")
private String endTime;
@ApiModelProperty(value="合同主体")
private String leaseTerm;
@ApiModelProperty(value="")
@ApiModelProperty(value="预付款")
private String advanceCharge;
@ApiModelProperty(value="")
@ApiModelProperty(value="授权人")
@Excel(name = "授权人")
private String authorizingPerson;
@ApiModelProperty(value="")
@ApiModelProperty(value="联系方式")
@Excel(name = "授权人电话")
private String authorizingPhone;
@ApiModelProperty(value="")
private String contractNumber;
@ApiModelProperty(value="创建人")
private String creator;
@ApiModelProperty(value="")
@ApiModelProperty(value="结算时间")
private String settlementTime;
@ApiModelProperty(value="")
@ApiModelProperty(value="是否结算")
private String isBalance;
@ApiModelProperty(value="")
@ApiModelProperty(value="合同文件")
@Excel(name = "合同文件")
private String url;
@ApiModelProperty(value="")
@ApiModelProperty(value="是否提交结算")
private String isSure;
@ApiModelProperty(value="")
@ApiModelProperty(value="数据所属")
private Integer companyId;
/**
@ -74,4 +95,7 @@ public class BmAgreement extends BaseEntity implements Serializable {
@ApiModelProperty(value="i8系统是否推送")
private String isPush;
@ApiModelProperty(value="关键字")
private String keyWord;
}

110
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmProject.java
View File

@ -1,5 +1,6 @@
package com.bonus.base.api.domain;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -19,33 +20,71 @@ public class BmProject extends BaseEntity implements Serializable {
/**
*
*/
@ApiModelProperty(value = "")
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 项目类型。 1：线路工程；2:变电工程；3:业务工程；4:其他工程
*/
@ApiModelProperty(value = "项目类型。 1：线路工程；2:变电工程；3:业务工程；4:其他工程")
private Integer projectType;
/**
* 工程名称
*/
@ApiModelProperty(value = "工程名称")
@Excel(name = "工程项目名称")
private String name;
/**
* 实施单位
*/
@ApiModelProperty(value = "实施单位")
@Excel(name = "实施单位")
private String impUnit;
/**
* 项目类型。 1：线路工程；2:变电工程；3:业务工程；4:其他工程
*/
@ApiModelProperty(value = "项目类型。 1：线路工程；2:变电工程；3:业务工程；4:其他工程")
@Excel(name = "工程类型")
private Integer projectType;
/**
* i8工程id
*/
@ApiModelProperty(value = "i8工程id")
@Excel(name = "i8工程id")
private String proId;
/**
* 是否匹配i8工程
*/
@ApiModelProperty(value = "是否匹配i8工程")
@Excel(name = "是否匹配i8工程")
private String isMatchI8;
/**
* 合同主体
*/
@ApiModelProperty(value = "合同主体")
@Excel(name = "合同主体")
private String htzt;
/**
* 项目经理
*/
@ApiModelProperty(value = "项目经理")
@Excel(name = "项目经理")
private String manager;
/**
* 联系方式
*/
@ApiModelProperty(value = "联系方式")
private String telphone;
/**
* 工程编号
*/
@ApiModelProperty(value = "工程编号")
private String num;
/**
* 项目经理
*/
@ApiModelProperty(value = "项目经理")
private String manager;
/**
* 项目性质
*/
@ -56,13 +95,15 @@ public class BmProject extends BaseEntity implements Serializable {
* 联系方式
*/
@ApiModelProperty(value = "联系方式")
private String telphone;
@Excel(name = "联系电话")
private String phone;
/**
* 联系方式
* 工程状态
*/
@ApiModelProperty(value = "联系方式")
private String phone;
@ApiModelProperty(value = "工程状态")
@Excel(name = "工程状态")
private String stats;
/**
* 传真
@ -76,6 +117,12 @@ public class BmProject extends BaseEntity implements Serializable {
@ApiModelProperty(value = "地址")
private String address;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
@Excel(name = "备注")
private String remark;
/**
* 材料员
@ -101,6 +148,11 @@ public class BmProject extends BaseEntity implements Serializable {
@ApiModelProperty(value = "创建时间")
private String time;
/**
* 是否启用0不启用1启用
*/
@ApiModelProperty(value = "是否启用0不启用1启用")
private String isActive;
/**
* 经度
@ -120,24 +172,12 @@ public class BmProject extends BaseEntity implements Serializable {
@ApiModelProperty(value = "组织分公司id")
private String company;
/**
* 实施单位
*/
@ApiModelProperty(value = "实施单位")
private String impUnit;
/**
* 项目部
*/
@ApiModelProperty(value = "项目部")
private String deptName;
/**
* i8工程id
*/
@ApiModelProperty(value = "i8工程id")
private String proId;
/**
* 项目部id
*/
@ -150,18 +190,6 @@ public class BmProject extends BaseEntity implements Serializable {
@ApiModelProperty(value = "电压等级")
private String cvo;
/**
* 工程状态
*/
@ApiModelProperty(value = "工程状态")
private String stats;
/**
* 合同主体
*/
@ApiModelProperty(value = "合同主体")
private String htzt;
/**
* 工程补录是否匹配
*/

4
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmSupplier.java
View File

@ -63,10 +63,6 @@ public class BmSupplier extends BaseEntity implements Serializable {
@Excel(name = "备注")
private String notes;
/** 是否启用 0不启用 1启用 */
@ApiModelProperty(value = "是否启用 0不启用 1启用")
private String isActive;
/** 数据所属组织 */
@ApiModelProperty(value = "数据所属组织")
private Integer companyId;

11
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
View File

@ -134,6 +134,17 @@ public class SysUser extends BaseEntity {
*/
private String approvalStatus;
/** 所属组织id */
private Long companyId;
public Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
public SysUser() {
}

19
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java
View File

@ -3,11 +3,14 @@ package com.bonus.base.controller;
import com.bonus.base.api.domain.BmAgreement;
import com.bonus.base.service.BmAgreementService;
import com.bonus.base.utils.ResultBean;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.page.TableDataInfo;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@ -32,7 +35,7 @@ public class BmAgreementController extends BaseController {
@GetMapping("/getAgreementList")
public TableDataInfo list(BmAgreement bmAgreement) {
startPage();
List<BmAgreement> list = this.bmAgreementService.selectAll();
List<BmAgreement> list = this.bmAgreementService.selectAll(bmAgreement);
return getDataTable(list);
}
@ -57,7 +60,7 @@ public class BmAgreementController extends BaseController {
@PostMapping(value = "/add")
public ResultBean<Boolean> add(@RequestBody BmAgreement bmAgreement) {
int result = this.bmAgreementService.insertSelective(bmAgreement);
return result > 0 ? ResultBean.success(true) : ResultBean.error("删除失败");
return result > 0 ? ResultBean.success(true) : ResultBean.error("新增失败");
}
/**
@ -83,4 +86,16 @@ public class BmAgreementController extends BaseController {
return ResultBean.toIsSuccess(this.bmAgreementService.deleteByPrimaryKey(id), "删除成功");
}
/**
* 导出协议列表
*/
@ApiOperation(value = "导出协议列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BmAgreement bmAgreement)
{
List<BmAgreement> list = this.bmAgreementService.selectAll(bmAgreement);
ExcelUtil<BmAgreement> util = new ExcelUtil<>(BmAgreement.class);
util.exportExcel(response, list, "协议列表数据");
}
}

27
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java
View File

@ -2,6 +2,7 @@ package com.bonus.base.controller;
import com.bonus.base.api.domain.BmCustomer;
import com.bonus.base.service.IBmCustomerService;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
@ -9,11 +10,13 @@ import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@ -47,6 +50,18 @@ public class BmCustomerController extends BaseController {
return getDataTableError(new ArrayList<>());
}
/**
* 获取往来单位下拉选
*/
@ApiOperation(value = "获取往来单位下拉选")
@GetMapping("/getUnitInfoSelect")
public AjaxResult getUnitInfoSelect(BmCustomer bmCustomer)
{
List<BmCustomer> list = customerService.selectCustomerList(bmCustomer);
return AjaxResult.success(list);
}
/**
* 根据往来单位编号获取详细信息
*/
@ -108,4 +123,16 @@ public class BmCustomerController extends BaseController {
return error("系统异常");
}
/**
* 导出往来单位列表
*/
@ApiOperation(value = "导出往来单位列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BmCustomer bmCustomer)
{
List<BmCustomer> list = customerService.selectCustomerList(bmCustomer);
ExcelUtil<BmCustomer> util = new ExcelUtil<>(BmCustomer.class);
util.exportExcel(response, list, "往来单位列表数据");
}
}

32
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java
View File

@ -1,11 +1,14 @@
package com.bonus.base.controller;
import com.bonus.base.api.domain.BmProject;
import com.bonus.base.service.BmProjectService;
import com.bonus.base.utils.ResultBean;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
@ -31,17 +34,29 @@ public class BmProjectController extends BaseController {
/**
* 分页查询
* @param bmCustomerType 请求条件
* @param bmProject 请求条件
* @return 工程列表
*/
@GetMapping("/getProjectList")
@RequiresPermissions("base:project:query")
public TableDataInfo list(BmProject bmCustomerType) {
public TableDataInfo list(BmProject bmProject) {
startPage();
List<BmProject> list = bmProjectService.selectAll();
List<BmProject> list = bmProjectService.selectAll(bmProject);
return getDataTable(list);
}
/**
* 获取工程下拉选
*/
@ApiOperation(value = "获取工程下拉选")
@GetMapping("/getProjectSelect")
public AjaxResult getUnitInfoSelect(BmProject bmProject)
{
List<BmProject> list = bmProjectService.selectAll(bmProject);
return AjaxResult.success(list);
}
/**
* 通过主键查询单条数据
@ -93,8 +108,15 @@ public class BmProjectController extends BaseController {
* 批量导出excel
*/
@PostMapping("/export")
public void export(HttpServletResponse response, BmProject record) {
List<BmProject> list = bmProjectService.selectAll();
public void export(HttpServletResponse response, BmProject bmProject) {
List<BmProject> list = bmProjectService.selectAll(bmProject);
list.forEach(record -> {
if (record.getProId() == null) {
record.setIsMatchI8("不匹配");
} else {
record.setIsMatchI8("匹配");
}
});
ExcelUtil<BmProject> util = new ExcelUtil<>(BmProject.class);
util.exportExcel(response, list, "工程管理数据");
}

3
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java
View File

@ -6,6 +6,7 @@ import com.bonus.base.utils.ResultBean;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.security.utils.SecurityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@ -65,6 +66,8 @@ public class BmSupplierController extends BaseController {
@ApiOperation(value = "新增供应商管理数据")
@PostMapping("/add")
public ResultBean<Boolean> add(@RequestBody BmSupplier bmSupplier) {
Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
bmSupplier.setCompanyId(Integer.parseInt(companyId.toString()));
int result = bmSupplierService.insert(bmSupplier);
return result > 0 ? ResultBean.success(true) : ResultBean.error(0, "新增失败");
}

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java
View File

@ -46,7 +46,7 @@ public interface BmAgreementMapper {
*/
BmAgreement selectByPrimaryKey(Integer id);
List<BmAgreement> selectAll();
List<BmAgreement> selectAll(BmAgreement bmAgreement);
/**
* update record selective

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmProjectMapper.java
View File

@ -46,7 +46,7 @@ public interface BmProjectMapper {
*/
BmProject selectByPrimaryKey(Integer id);
List<BmProject> selectAll();
List<BmProject> selectAll(BmProject bmProject);
/**
* update record selective

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java
View File

@ -22,7 +22,7 @@ public class BmAgreementService{
@Resource
private BmAgreementMapper bmAgreementMapper;
public List<BmAgreement> selectAll() {return bmAgreementMapper.selectAll();}
public List<BmAgreement> selectAll(BmAgreement bmAgreement) {return bmAgreementMapper.selectAll(bmAgreement);}
public int deleteByPrimaryKey(Integer id) {
return bmAgreementMapper.deleteByPrimaryKey(id);

4
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java
View File

@ -22,8 +22,8 @@ public class BmProjectService{
@Autowired
private BmProjectMapper bmProjectMapper;
public List<BmProject> selectAll() {
return bmProjectMapper.selectAll();
public List<BmProject> selectAll(BmProject bmProject) {
return bmProjectMapper.selectAll(bmProject);
}
public int deleteByPrimaryKey(Integer id) {

34
bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml
View File

@ -26,9 +26,10 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, code, sign_date, project, start_time, lease_term, advance_charge,
authorizing_person, authorizing_phone, contract_number, creator, create_time, remark,
settlement_time, is_balance, url, is_sure, company_id, is_push
ba.id, code, sign_date, project, start_time, lease_term, advance_charge,
authorizing_person, authorizing_phone, contract_number, creator, create_time, ba.remark,
settlement_time, is_balance, url, is_sure, ba.company_id, is_push, bp.name as projectName,
bc.name as unitName
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated-->
@ -41,7 +42,32 @@
<select id="selectAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from bm_agreement
from bm_agreement ba
left join bm_project bp on ba.project = bp.id
left join bm_customer bc on ba.customer = bc.id
WHERE
1 =1
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND ba.start_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if>
<if test="isBalance != null and isBalance !=''">
AND ba.is_balance = #{isBalance}
</if>
<if test="companyId != null and companyId !=''">
and ba.company_id = #{companyId}
</if>
<if test="keyWord != null and keyWord !='' ">
AND(
ba.`code` LIKE CONCAT('%',#{keyWord},'%')
OR bp.name LIKE CONCAT('%',#{keyWord},'%')
OR bc.name LIKE CONCAT('%',#{keyWord},'%')
OR ba.lease_term LIKE CONCAT('%',#{keyWord},'%')
OR ba.remark LIKE CONCAT('%',#{keyWord},'%')
OR ba.authorizing_person LIKE CONCAT('%',#{keyWord},'%')
OR ba.authorizing_phone LIKE CONCAT('%',#{keyWord},'%')
)
</if>
order by ba.sign_date desc
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">

5
bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml
View File

@ -51,8 +51,11 @@
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
from bm_project
from bm_project bmp
where is_active = '1'
<if test="name !=null and name !=''">
and bmp.name LIKE CONCAT('%',#{name},'%')
</if>
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">