Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -39,5 +39,5 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
 	List<FirefightersDto> queryById(@Param("gw")String[] gw, @Param("name")String name);
 	
-	 List<Map<String,String>> selectNormalFirePerson(String jobCode);
+	 List<Map<String,String>> selectNormalFirePerson(String jobId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -209,7 +209,10 @@ SELECT
 				OR cf.state_code IS NULL
 			)
 		AND cf.is_delete = FALSE
-		AND cf.job_title_code = #{jobCode}
+	<if test="jobCode != null">
+        AND cf.job_title_code = #{jobCode}
+    </if>
+
 	) cff
 LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -167,8 +167,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		return	this.baseMapper.selectMaps(wrapper);
 	}
 
-	public Object getAllFirefightersPerson(int size, int current, String jobCode) {
-		return firefightersMapper.selectNormalFirePerson(jobCode);
+	public Object getAllFirefightersPerson(String jobId) {
+		return firefightersMapper.selectNormalFirePerson(jobId);
 	}
 	
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -334,7 +334,7 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/all/fire/person", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "所有的消防人员", notes = "所有的消防人员")
-    public ResponseModel<Object> getAllFirefightersPerson(@RequestParam int  size ,@RequestParam int current,@RequestParam String jobCode)throws Exception {
-        return ResponseHelper.buildResponse(iFirefightersService.getAllFirefightersPerson(size,current,jobCode));
+    public ResponseModel<Object> getAllFirefightersPerson(String jobCode)throws Exception {
+        return ResponseHelper.buildResponse(iFirefightersService.getAllFirefightersPerson(jobCode));
     }
 }

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -303,4 +303,13 @@
             ALTER TABLE `p_check_report` MODIFY COLUMN `id` bigint(30) NOT NULL AUTO_INCREMENT COMMENT '主键';
         </sql>
     </changeSet>
+    <changeSet author="xxz" id="20211201-1">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_plan" columnName="create_date"/>
+        </preConditions>
+        <comment>modify p_plan COLUMN create_date</comment>
+        <sql>
+            ALTER TABLE `p_plan` MODIFY COLUMN `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file