LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:企业端分标委

Browse Source
This commit is contained in:
zhangqinlin
2022-01-05 10:42:47 +08:00
parent b03620dce0
commit 9737afc852
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+2 -2
View File
@@ -266,8 +266,8 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
*/
@RequiresPermissions("council:export")
@AutoLog(value = "分标委表导出-导出")
@ApiOperation(value="分标委表导出-导出", notes="分标委表导出-导出")
@AutoLog(value = "理事会-导出")
@ApiOperation(value="理事会-导出", notes="理事会-导出")
@GetMapping(value = "/exportXls",produces = "text/text;charset=utf-8")
public ModelAndView customExportXlsList(@RequestParam(name="contactsName",required =false) String contactsName,
@RequestParam(name = "selects",required = false) String selects,
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java
+3 -3
View File
@@ -12,12 +12,12 @@ public class subCouncil implements Serializable {
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "企业名称")
private String companyName;
@ApiModelProperty(value = "姓名")
private String peopleName;
@ApiModelProperty(value = "企业名称")
private String companyName;
@ApiModelProperty(value = "电话")
private String phone;
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+2 -2
View File
@@ -70,8 +70,8 @@
<if test=" companyName!=null and companyName != ''">
AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
</if>
<if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
<if test=" councilName!=null and councilName != ''">
AND pe.name LIKE CONCAT('%',#{councilName},'%')
</if>
</where>
order by pe.create_time desc
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+1 -1
View File
@@ -39,7 +39,7 @@
order by pe.create_time desc
</select>
<select id="listForChildren" resultType="com.jero.data.entity.subCouncil">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as id
SELECT pm.id as id,pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.phone as phone,pt.post as post
from
pay_case_council_subitem pm
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
+2 -2
View File
@@ -152,9 +152,9 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
public Result<?> edit(@RequestBody PayResearchProject payResearchProject) {
QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("project_name",payResearchProject.getProjectName());
queryWrapper.eq("id",payResearchProject.getId());
queryWrapper.eq("working_group_id",payResearchProject.getWorkingGroupId());
int count = payResearchProjectService.count(queryWrapper);
if (count>1) {
if (count>0) {
return Result.error("项目名称已存在");
}
//删除关联文件表