admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
Administrator 2023-05-27 17:02:12 +08:00
parent e5fac47526
commit 63ee4dbc19
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java
View File

@ -179,7 +179,7 @@ public class QueryGenerator {
//模糊查询
if (fieldNameSet != null && fieldNameSet.contains(name)) {
Object v = PropertyUtils.getSimpleProperty(searchObj, name);
queryWrapper.like(v != null, enableAlias ? defaultAlias + StrUtil.toUnderlineCase(name) : StrUtil.toUnderlineCase(name), v);
queryWrapper.like(!StrUtil.isBlankIfStr(v), enableAlias ? defaultAlias + StrUtil.toUnderlineCase(name) : StrUtil.toUnderlineCase(name), v);
continue;
}

9
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml
View File

@ -9,12 +9,11 @@
<select id="getCompanyConfigBySN" resultMap="companyConfigMap" parameterType="string">
SELECT b.*, a.headquarters_sn, c.company_name, a.propagate_file
SELECT b.*, a.headquarters_sn, c.company_name, c.propagate_file
FROM company a
INNER JOIN company_config b ON a.headquarters_sn = b.company_sn
LEFT JOIN company c ON a.headquarters_sn = c.company_sn
INNER JOIN company_config b ON a.headquarters_sn = b.company_sn
LEFT JOIN company c ON a.headquarters_sn = c.company_sn
WHERE a.company_sn = #{companySn}
</select>
<select id="getCompanyConfigByProject" resultMap="companyConfigMap">
SELECT c.*, b.headquarters_sn, d.company_name, b.propagate_file
@ -41,4 +40,4 @@
INNER JOIN company_config c ON b.headquarters_sn = c.company_sn
where a.project_sn = #{projectSn}
</select>
</mapper>
</mapper>

1
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java
View File

@ -179,7 +179,6 @@ public class SjSafeEnvironmentFileServiceImpl extends ServiceImpl<SjSafeEnvironm
new LambdaQueryWrapper<SjSafeEnvironmentFile>()
.eq(SjSafeEnvironmentFile::getFileUrl, oldSjSafeEnvironmentFile.getFileUrl())
.in(SjSafeEnvironmentFile::getProjectSn, projectSnList)
.eq(StringUtils.isNotBlank(sjSafeEnvironmentFile.getProjectSn()), SjSafeEnvironmentFile::getProjectSn, sjSafeEnvironmentFile.getProjectSn())
.eq(SjSafeEnvironmentFile::getIsDir, 0)
);

8
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java
View File

@ -12,10 +12,7 @@ import com.zhgd.xmgl.modules.worker.entity.vo.PersonnelSituationVO;
import com.zhgd.xmgl.modules.worker.entity.vo.WorkerInfoDetailsVo;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
import com.zhgd.xmgl.util.MessageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -140,6 +137,9 @@ public class WorkerInfoController {
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "leaderName", value = "负责人姓名（班组）", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "chargePersonName", value = "负责人姓名（部门）", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "belongingSection", value = "所属标段（部门）", paramType = "query", required = false, dataType = "String"),
})
@PostMapping(value = "/selectWorkerInfoList")
public Result<IPage<EntityMap>> selectWorkerInfoList(@RequestBody Map<String, Object> map) {

6
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -39,6 +39,12 @@
<if test="param.chargePersonName != null and param.chargePersonName != ''">
and c.charge_person_name like CONCAT(CONCAT('%',#{param.chargePersonName}),'%')
</if>
<if test="param.leaderName != null and param.leaderName != ''">
and b.leader_name like CONCAT(CONCAT('%',#{param.leaderName}),'%')
</if>
<if test="param.belongingSection != null and param.belongingSection != ''">
and c.belonging_section like CONCAT(CONCAT('%',#{param.belongingSection}),'%')
</if>
<if test="param.belongingSection != null and param.belongingSection != ''">
and c.belonging_section like CONCAT(CONCAT('%',#{param.belongingSection}),'%')
</if>