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

重庆需求变更代码提交

This commit is contained in:
liang.chao 2024-09-24 14:41:41 +08:00
parent 7705e3245a
commit 2894862a48
7 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java
View File

@ -5,6 +5,7 @@ import com.bonus.sgzb.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.List;
@ -125,6 +126,11 @@ public class BmProjectLot {
@Excel(name = "工程类型")
@ApiModelProperty(value = "工程类型名称")
private String typeName;
/**
* 费用指标
*/
@ApiModelProperty(value = "费用指标")
private BigDecimal costIndicators;
/** 导出选中列表 */
private List<Long> dataCondition;

29
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java
View File

@ -34,8 +34,7 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
@RestController
@Api(value = "新购验收任务详细")
@RequestMapping("/purchaseCheckDetails")
public class PurchaseCheckDetailsController extends BaseController
{
public class PurchaseCheckDetailsController extends BaseController {
@Autowired
private IPurchaseCheckDetailsService purchaseCheckDetailsService;
@ -44,8 +43,7 @@ public class PurchaseCheckDetailsController extends BaseController
*/
@ApiOperation(value = "查询新购验收任务详细列表")
@GetMapping("/list")
public TableDataInfo list(PurchaseCheckDetails purchaseCheckDetails)
{
public TableDataInfo list(PurchaseCheckDetails purchaseCheckDetails) {
List<PurchaseCheckDetails> list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails);
return getDataTable(list);
}
@ -56,8 +54,7 @@ public class PurchaseCheckDetailsController extends BaseController
@RequiresPermissions("domain:details:export")
@Log(title = "新购验收任务详细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PurchaseCheckDetails purchaseCheckDetails)
{
public void export(HttpServletResponse response, PurchaseCheckDetails purchaseCheckDetails) {
List<PurchaseCheckDetails> list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails);
ExcelUtil<PurchaseCheckDetails> util = new ExcelUtil<PurchaseCheckDetails>(PurchaseCheckDetails.class);
util.exportExcel(response, list, "新购验收任务详细数据");
@ -68,8 +65,7 @@ public class PurchaseCheckDetailsController extends BaseController
*/
@ApiOperation(value = "获取新购验收任务详细详细信息")
@GetMapping(value = "/{taskId}")
public AjaxResult getInfo(@PathVariable("taskId") Long taskId)
{
public AjaxResult getInfo(@PathVariable("taskId") Long taskId) {
return success(purchaseCheckDetailsService.selectPurchaseCheckDetailsByTaskId(taskId));
}
@ -79,8 +75,7 @@ public class PurchaseCheckDetailsController extends BaseController
@ApiOperation(value = "新增新购验收任务详细")
@Log(title = "新购验收任务详细", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody List<PurchaseCheckDetails> purchaseCheckDetailsList)
{
public AjaxResult add(@RequestBody List<PurchaseCheckDetails> purchaseCheckDetailsList) {
return toAjax(purchaseCheckDetailsService.insertPurchaseCheckDetails(purchaseCheckDetailsList));
}
@ -91,19 +86,23 @@ public class PurchaseCheckDetailsController extends BaseController
@ApiOperation(value = "验收审核")
@Log(title = "验收审核", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody List<PurchaseCheckDetails> purchaseCheckDetailsList)
{
public AjaxResult edit(@RequestBody List<PurchaseCheckDetails> purchaseCheckDetailsList) {
return toAjax(purchaseCheckDetailsService.updatePurchaseCheckDetails(purchaseCheckDetailsList));
}
@ApiOperation(value = "验收图片上传")
@PostMapping("/uploadPic")
public AjaxResult uploadPic(@RequestBody PurchaseCheckDetails purchaseCheckDetails) {
return toAjax(purchaseCheckDetailsService.uploadPic(purchaseCheckDetails));
}
/**
* 删除新购验收任务详细
*/
@ApiOperation(value = "删除新购验收任务详细")
@Log(title = "删除新购验收任务详细", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable Long id)
{
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable Long id) {
return toAjax(purchaseCheckDetailsService.deletePurchaseCheckDetailsByTaskId(id));
}
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java
View File

@ -151,4 +151,6 @@ public interface PurchaseCheckDetailsMapper {
int updateStatusByTaskIdTypeId(PurchaseCheckDetails purchaseCheckDetails);
int updateByTaskId(@Param("taskId") Long taskId,@Param("typeId") Long typeId);
int uploadPic(PurchaseCheckDetails purchaseCheckDetails);
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java
View File

@ -59,4 +59,6 @@ public interface IPurchaseCheckDetailsService
* @return 结果
*/
public int deletePurchaseCheckDetailsByTaskId(Long id);
int uploadPic(PurchaseCheckDetails purchaseCheckDetails);
}

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java
View File

@ -131,4 +131,9 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
public int deletePurchaseCheckDetailsByTaskId(Long id) {
return purchaseCheckDetailsMapper.deletePurchaseCheckDetailsByTaskId(id);
}
@Override
public int uploadPic(PurchaseCheckDetails purchaseCheckDetails) {
return purchaseCheckDetailsMapper.uploadPic(purchaseCheckDetails);
}
}

6
sgzb-modules/sgzb-material/src/main/resources/mapper/base/BmProjectLotMapper.xml
View File

@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="companyId" column="company_id" />
<result property="deptName" column="dept_name" />
<result property="typeName" column="name" />
<result property="costIndicators" column="cost_indicators" />
</resultMap>
<sql id="bmProjectInfo">
@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getProjectLotAll" parameterType="com.bonus.sgzb.base.domain.BmProjectLot" resultMap="BmProjectLotResult">
<!--<include refid="bmProjectInfo"/>-->
select a.lot_id, a.pro_id, a.lot_name, a.status, a.type_id, a.link_man, a.telphone, a.own_pro, a.dept_id, a.is_share,
a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name
a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.cost_indicators
from bm_project_lot a
left join sys_dept b on a.dept_id = b.dept_id
left join sys_dic c on a.type_id = c.id
@ -115,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null and updateTime != ''">update_time,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="companyId != null and companyId != ''">company_id,</if>
<if test="costIndicators != null and costIndicators != ''">cost_indicators,</if>
create_time
)values(
<if test="lotName != null and lotName != ''">#{lotName},</if>
@ -130,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="companyId != null and companyId != ''">#{companyId},</if>
<if test="costIndicators != null and costIndicators != ''">#{costIndicators},</if>
sysdate()
)
</insert>
@ -221,6 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''">update_by =#{updateBy},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
<if test="costIndicators != null and costIndicators != ''">cost_indicators = #{costIndicators},</if>
update_time = sysdate()
</set>
where lot_id = #{lotId}

8
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
View File

@ -267,4 +267,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateByTaskId">
update purchase_check_details set bind_num = bind_num - 1 , status='7' where task_id = #{taskId} and type_id = #{typeId}
</update>
<update id="uploadPic">
update purchase_check_details
<trim prefix="SET" suffixOverrides=",">
<if test="checkUrlName != null">check_url_name = #{checkUrlName},</if>
<if test="checkUrl != null">check_url = #{checkUrl},</if>
</trim>
where id = #{id}
</update>
</mapper>