完善导入通知

laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java

@@ -116,7 +116,7 @@ public class ProcessNewStandardImport implements Serializable {
     private String copyUser;
     /**通知发起人*/
     @ApiModelProperty(value = "通知发起人")
-    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "sys_user", dicText = "CONCAT(realname,'(',username,')')", dicCode = "username")
     @Excel(name = "法规要求简要描述", width = 15,dictTable = "sys_user", dicText = "realname", dicCode = "username")
     private String createBy;
     /**实施日期*/

laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml

@@ -15,9 +15,11 @@
     <select id="queryByPage" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport">
         select p.*,p1.standard_number,p1.standard_name,
         (select GROUP_CONCAT(replaced SEPARATOR ', ') from laws_replaced_standard where type=1 and replaced_by = p1.standard_number) as substitute_standard_number,
-        p1.implementation_date,p1.new_product_impl_date,p1.new_auth_impl_date,p1.registration_date
+        p1.implementation_date,p1.new_product_impl_date,p1.new_auth_impl_date,p1.registration_date,p2.end_time as publishDate
         from process_standard_import p
         left join laws_domestic_standard p1 on p.standard_id = p1.id and p1.del_flag = 0
+        left join process_all p2 on p2.process_instance_id = p.process_instance_id
+        left join sys_user s1 on s1.username = p1.create_by and s1.del_flag = 0
         ${ew.customSqlSegment}
     </select>
 </mapper>

laws-modules/src/main/java/com/jero/modules/laws/lead/service/impl/LawsImportInfoServiceImpl.java

@@ -7,14 +7,14 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;
 import com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper;
-import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService;
 import com.jero.modules.laws.lead.service.ILawsImportInfoService;
-import com.jero.modules.laws.lead.vo.ProcessNewStandardImportExcel;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -35,17 +35,47 @@ public class LawsImportInfoServiceImpl implements ILawsImportInfoService {
 
     @Override
     public IPage<ProcessNewStandardImport> page(ProcessNewStandardImport processNewStandardImport, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<ProcessNewStandardImport> queryWrapper = getProcessNewStandardImportQueryWrapper(processNewStandardImport, req);
+        Page<ProcessNewStandardImport> page = new Page<>(pageNo, pageSize);
+        return processNewStandardImportMapper.queryByPage(page, queryWrapper);
+    }
+
+    @NotNull
+    private QueryWrapper<ProcessNewStandardImport> getProcessNewStandardImportQueryWrapper(ProcessNewStandardImport processNewStandardImport, HttpServletRequest req) {
+        String applicableMarket = "";
+        if (!StringUtils.isEmpty(processNewStandardImport.getApplicableMarket())) {
+            applicableMarket = processNewStandardImport.getApplicableMarket();
+            processNewStandardImport.setApplicableMarket(null);
+        }
+        String mainDeptProfMode = "";
+        if (!StringUtils.isEmpty(processNewStandardImport.getMainDeptProfMode())) {
+            mainDeptProfMode = processNewStandardImport.getMainDeptProfMode();
+            processNewStandardImport.setMainDeptProfMode(null);
+        }
+        String createBy = "";
+        if (!StringUtils.isEmpty(processNewStandardImport.getCreateBy())) {
+            createBy = processNewStandardImport.getCreateBy();
+            processNewStandardImport.setCreateBy(null);
+        }
         QueryWrapper<ProcessNewStandardImport> queryWrapper =
                 QueryGenerator.initQueryWrapper(processNewStandardImport, req.getParameterMap());
-        Page<ProcessNewStandardImport> page = new Page<>(pageNo, pageSize);
+        queryWrapper.eq("p.del_flag", "0");
-        IPage<ProcessNewStandardImport> re = processNewStandardImportMapper.queryByPage(page, queryWrapper);
+        queryWrapper.like(!StringUtils.isEmpty(processNewStandardImport.getStandardNumber()),
-        return re;
+                "p1.standard_number", processNewStandardImport.getStandardNumber());
+        queryWrapper.like(!StringUtils.isEmpty(processNewStandardImport.getStandardName()),
+                "p1.standard_name", processNewStandardImport.getStandardName());
+        queryWrapper.like(!StringUtils.isEmpty(applicableMarket),
+                "concat(',',p.applicable_market,',')", "," + applicableMarket + ",");
+        queryWrapper.like(!StringUtils.isEmpty(mainDeptProfMode),
+                "concat(',',p.main_dept_prof_mode,',')", "," + mainDeptProfMode + ",");
+        queryWrapper.like(!StringUtils.isEmpty(createBy),
+                "s1.realname", createBy);
+        return queryWrapper;
     }
 
     @Override
     public ModelAndView export(ProcessNewStandardImport processNewStandardImport, HttpServletRequest request) {
-        QueryWrapper<ProcessNewStandardImport> queryWrapper =
+        QueryWrapper<ProcessNewStandardImport> queryWrapper = getProcessNewStandardImportQueryWrapper(processNewStandardImport, request);
-                QueryGenerator.initQueryWrapper(processNewStandardImport, request.getParameterMap());
         List<ProcessNewStandardImport> re = processNewStandardImportMapper.queryByPage(queryWrapper);
         // Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());