祖军自测问题 修改

cement-business/pom.xml

@@ -202,11 +202,11 @@
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
-              <!--  <includes>
-                    <include>*.xlsx</include>
-                    <include>*.properties</include>
-                    <include>*.xml</include>
-                </includes>-->
+                <includes>
+                <include>*.xlsx</include>
+                <include>*.properties</include>
+                <include>*.xml</include>
+            </includes>
                 <excludes>
                     <exclude>*.yml</exclude>
                 </excludes>

cement-business/src/main/java/cn/wise/sc/cement/business/controller/CapabilityManagementController.java

@@ -89,8 +89,8 @@ public class CapabilityManagementController {
 	}
 
 	@ApiOperation(value = "删除能力管理信息")
-	@PostMapping("/delete/{id}")
-	public BaseResponse delete(@PathVariable Integer id) {
+	@PostMapping("/delete")
+	public BaseResponse delete(Integer id) {
 		try {
 			return capabilityManagementService.delete(id);
 		} catch (Exception e) {

cement-business/src/main/java/cn/wise/sc/cement/business/controller/HistoryArchivesController.java

@@ -81,8 +81,8 @@ public class HistoryArchivesController {
 	}
 
 	@ApiOperation(value = "删除历史档案")
-	@PostMapping("/delete/{id}")
-	public BaseResponse delete(@PathVariable Integer id) {
+	@PostMapping("/delete")
+	public BaseResponse delete(Integer id) {
 		try {
 			return iHistoryArchivesService.delete(id);
 		} catch (Exception e) {

cement-business/src/main/java/cn/wise/sc/cement/business/controller/TeamController.java

@@ -47,12 +47,14 @@ public class TeamController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "status", value = "状态0:禁用 1:启用", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "groupName", value = "检测组名称", paramType = "query", dataType = "String"),
-			@ApiImplicitParam(name = "name", value = "检测项目名称", paramType = "query", dataType = "String")
+			@ApiImplicitParam(name = "name", value = "检测项目名称", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "qualifications", value = "资质范围 （1资质内，0资质外）", paramType = "query", dataType = "Integer")
 	})
 	@GetMapping("/getPage")
-	public BaseResponse getPage(PageQuery pageQuery, Integer status, String groupName, String name) {
+	public BaseResponse getPage(PageQuery pageQuery, Integer status, String groupName, String name,
+	                            Integer qualifications) {
 		try {
-			return teamService.getPage(pageQuery, status, groupName, name);
+			return teamService.getPage(pageQuery, status, groupName, name, qualifications);
 		} catch (Exception e) {
 			log.debug("检测项分页列表{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanTrainingMapper.xml

@@ -24,7 +24,7 @@
         pt.*
         from plan_training pt
         <include refid="where"/>
-        order by pt.id asc
+        order by pt.id desc
     </select>
 
     <select id="getById" resultType="cn.wise.sc.cement.business.model.vo.PlanTrainingVo">

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/ProjectMapper.xml

@@ -4,7 +4,7 @@
     <sql id="where">
         <where>
             <if test="params.code != null and params.code != ''">
-                and t.code = #{params.code}
+                and t.code = like concat('%', #{params.code}, '%')
             </if>
             <if test="params.clientId != null">
                 and t.client_id = #{params.clientId}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysApprovalMapper.xml

@@ -6,7 +6,7 @@
         select sa.*, su.name as userName
         from sys_approval sa
         left join sys_user su on su.id = sa.user_id
-        order by  sa.name
+        order by sa.create_time desc
     </select>
 
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysUserMapper.xml

@@ -8,8 +8,8 @@
             <if test="params.status != null ">
                 and su.status = #{params.status}
             </if>
-            <if test="params.gourpId != null and params.gourpId != ''">
-                and su.group_id = #{params.gourpId}
+            <if test="params.groupId != null">
+                and su.group_id = #{params.groupId}
             </if>
             <if test="params.name != null and params.name != ''">
                 and su.name like concat('%', #{params.name}, '%')

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml

@@ -7,11 +7,14 @@
                 and t.status = #{params.status}
             </if>
             <if test="params.groupName != null and params.groupName != ''">
-                and tg.group_name = #{params.groupName}
+                and tg.name = #{params.groupName}
             </if>
             <if test="params.name != null and params.name != ''">
                 and t.name like concat('%', #{params.name}, '%')
             </if>
+            <if test="params.qualifications != null">
+                and t.qualifications = #{params.qualifications}
+            </if>
         </where>
     </sql>
 
@@ -31,7 +34,7 @@
         left join method m on m.id = t.method_id
         left join handle h on h.id = t.handle_id
         <include refid="where"/>
-        ORDER BY t.id ASC
+        ORDER BY t.create_time desc
     </select>
 
     <select id="exportList" resultType="java.util.HashMap">

cement-business/src/main/java/cn/wise/sc/cement/business/service/ITeamService.java

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 public interface ITeamService extends IService<Team> {
 
-	BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, String groupName, String name);
+	BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, String groupName, String name, Integer qualifications);
 
 	BaseResponse<Team> create(TeamQuery query);
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java

@@ -58,11 +58,13 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 	 * @return
 	 */
 	@Override
-	public BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, String groupName, String name) {
+	public BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, String groupName, String name,
+												Integer qualifications) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("status", status);
 		params.put("groupName", groupName);
 		params.put("name", name);
+		params.put("qualifications", qualifications);
 		Page<TeamVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		IPage<TeamVo> pages = teamMapper.getPage(page, params);
 		return BaseResponse.okData(pages);

config/application.yml

 server:
-  port: 7007
+  port: 7006
 basename: sinoma_tcdri
 spring:
-  application: tianjin-cement
+  application: tianjin
   profiles:
 #    启动命令加上   -Dspring.config.location={文件路径}\config\application.yml
-    path: D:/idea_workspases/tianjin-cement/config
+    path: /opt/cement/config/tianjin/
     active: dev
   datasource:
     # 192.168.110.85   admin!@#123
@@ -21,7 +21,7 @@ spring:
       connection-test-query: SELECT 1
   redis:
     port: 6379
-    host: 192.168.110.85
+    host: localhost
   #    password: Wise_@123456
   servlet:
     multipart:
@@ -39,3 +39,13 @@ mybatis-plus:
   check-config-location: true
   type-aliases-package: cn.wise.sc.cement.business.entity.**
   mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
+
+weixin:
+  corpId: ww348f91b2573c1867
+  agentId: 1000002
+  agentIdPC: 1000003
+  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
+  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
+  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+  systemUrl: <a href=\"https://open.weixin.qq.com/connect/oauth2/authorize?appid="ww348f91b2573c1867"&redirect_uri="https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system"%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect\">物化检测流程" + "</a>,
+