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

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java

@@ -213,7 +213,8 @@ public class SysAnnouncementSendController {
 	@GetMapping(value = "/getMyAnnouncementSend")
 	public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
 			@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-			  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+			  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																	  String cut) {
 		Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
@@ -221,7 +222,7 @@ public class SysAnnouncementSendController {
 		announcementSendModel.setPageNo((pageNo-1)*pageSize);
 		announcementSendModel.setPageSize(pageSize);
 		Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
-		pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
+		pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel,cut);
 		result.setResult(pageList);
 		result.setSuccess(true);
 		return result;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java

@@ -684,7 +684,7 @@ public class SysPermissionController {
 			//项目参数任务
 			if(StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_PARAMETER_TASKS.getId())){
 				boolean existTaskFlag = false;
-//				existTaskFlag = sysPermissionService.judgeToDo();
+				existTaskFlag = sysPermissionService.judgeToDo();
 				meta.put("existTask",existTaskFlag);
 			}
 			json.put("meta", meta);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -72,6 +72,9 @@
         </if>
         <if test="announcementSendModel.msgContent !=null and announcementSendModel.msgContent != ''">
             and sa.msg_content LIKE concat(concat('%',#{announcementSendModel.msgContent}),'%')
+        </if>
+        <if test="announcementSendModel.msgContentCn !=null and announcementSendModel.msgContentCn != ''">
+            and sa.msg_content_cn LIKE concat(concat('%',#{announcementSendModel.msgContentCn}),'%')
         </if>
 	   order by sas.read_flag,sa.send_time desc
 	</select>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java

@@ -23,7 +23,7 @@ public interface ISysAnnouncementSendService extends IService<SysAnnouncementSen
 	 * @param announcementSendModel
 	 * @return
 	 */
-	public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,AnnouncementSendModel announcementSendModel);
+	public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,AnnouncementSendModel announcementSendModel,String cut);
 
 	List<AnnouncementSendModel> getMessageUnreadList();
 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.system.entity.SysAnnouncementSend;
 import com.jero.modules.system.mapper.SysAnnouncementSendMapper;
@@ -34,7 +35,11 @@ public class SysAnnouncementSendServiceImpl extends ServiceImpl<SysAnnouncementS
 
 	@Override
 	public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,
-			AnnouncementSendModel announcementSendModel) {
+			AnnouncementSendModel announcementSendModel,String cut) {
+		if(CutEnum.CN.getValue().equals(cut)){
+			announcementSendModel.setMsgContentCn(announcementSendModel.getMsgContent());
+			announcementSendModel.setMsgContent(null);
+		}
 		 return page.setRecords(sysAnnouncementSendMapper.getMyAnnouncementSendList(page, announcementSendModel));
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml

@@ -128,8 +128,8 @@
         pm.state as state,
         pm.project_id as project_id,
         pm.create_time as create_time,
-        pm.project_version as project_version,
-        concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.version) as project_name
+        pm.version as version,
+        concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name
         from params_manifest pm
         left join project_library_base as plb on plb.id = pm.project_id
         left join project_name_info as pni on plb.project_name_id = pni.id

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java

@@ -22,9 +22,9 @@ public class ParamsManifestTodoCenterEO {
     private String title;
 
     /**
-     * 相关项目版本
+     * 相关清单版本
      */
-    private String projectVersion;
+    private String version;
 
     /**
      * 待发起数量 包括状态：待发起收集,变更,工程接口人退回