fix: 修复稽查列表接口报错

This commit is contained in:
2023-09-11 16:18:58 +08:00
parent 37ae76ee92
commit 067d02f45e
5 changed files with 17 additions and 4 deletions
@@ -69,4 +69,11 @@ public interface ILawsCommonService {
**/ **/
String deleteByIdsAndModule(String ids, String module); String deleteByIdsAndModule(String ids, String module);
/**
* @Author: caihaohan
* @Date: 2023/9/11 16:05
* @Description: 获取体系树
**/
String getSystemTree(String module);
} }
@@ -402,6 +402,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
return MessageUtils.getMessage(ResultCommon.ERROR); return MessageUtils.getMessage(ResultCommon.ERROR);
} }
@Override
public String getSystemTree(String module) {
return null;
}
/** /**
* @Author: liao * @Author: liao
* @Date: 2023/8/24 9:53 * @Date: 2023/8/24 9:53
@@ -28,7 +28,7 @@ import javax.annotation.Resource;
* @Date: 2022-02-12 * @Date: 2022-02-12
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags="企标宣贯") @Api(tags="企标稽查")
@RestController @RestController
@RequestMapping("/enterprise/inspect") @RequestMapping("/enterprise/inspect")
@Slf4j @Slf4j
@@ -5,6 +5,7 @@ import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
import org.apache.ibatis.annotations.Param;
/** /**
* @author ThinkBook * @author ThinkBook
@@ -20,7 +21,7 @@ public interface EnterpriseStandardInspectMapper extends BaseMapper<EnterpriseSt
* @param esInspect * @param esInspect
* @return * @return
*/ */
IPage<EnterpriseStandardInspectVo> page(IPage<EnterpriseStandardInspectVo> page, ESQueryCommonDTO esInspect); IPage<EnterpriseStandardInspectVo> page(IPage<EnterpriseStandardInspectVo> page, @Param("param") ESQueryCommonDTO esInspect);
} }
@@ -40,11 +40,11 @@
FROM FROM
`laws_enterprise_standard_inspect` AS i `laws_enterprise_standard_inspect` AS i
LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no
LEFT JOIN sys_depart AS d on d.id = i.belone_dept LEFT JOIN sys_depart AS d on d.id = i.belong_dept
LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user
LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user
LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user
WHERE WHERE 1 = 1
<!--企标编号判断--> <!--企标编号判断-->
<if test="param.standardNo != null and param.standardNo != ''"> <if test="param.standardNo != null and param.standardNo != ''">
AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%') AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%')