暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -91,7 +91,7 @@ public class TicketController extends BaseController {
             @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId", value = "小区编号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (1：投诉   2：报修 3：联系物业)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
 
     })
@@ -148,7 +148,7 @@ public class TicketController extends BaseController {
     @ApiOperation(value = "添加 报修/投诉/联系单", notes = "添加 报修/投诉/联系单")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "ticketTitle:工单标题,ticketContent:工单内容，type: 0 代表 报修  1 代表 投诉  2代表 联系单 , repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
+                    "ticketTitle:工单标题,ticketContent:工单内容，type: 1：投诉   2：报修 3：联系物业 , repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addtpTicket", method = RequestMethod.POST)
@@ -171,17 +171,15 @@ public class TicketController extends BaseController {
     @ApiOperation(value = "修改 报修/投诉/联系单", notes = "修改 报修/投诉/联系单")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
             @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "工单类型  0 代表 报修  1 代表 投诉  2代表 联系单"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/updateTicket/{ticketId}", method = RequestMethod.POST)
     public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId,
                                             @RequestBody TpTicket tpTicket,
-                                            @RequestParam("type") String type,
                                             HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        iTicketService.updateTicketContent(ticketId, tpTicket, type,userElement.getId());
+        responseBean = iTicketService.updateTicketContent(ticketId, tpTicket,userElement.getId());
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java

@@ -60,10 +60,9 @@ public interface ITicketService {
 	 * 修改 维修/投诉/联系单 内容
 	 * @param ticketId
 	 * @param tpTicket
-	 * @param type
 	 * @param userId
 	 */
-	void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type,Integer userId);
+	ResponseBean updateTicketContent(Integer ticketId, TpTicket tpTicket,Integer userId);
 
 	/**
 	 * 终止 维修/投诉/联系单

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -326,20 +326,23 @@ public class SocialServiceImpl implements SocialServiceI {
     /**
      * 图片入库
      * @param tpTransaction
-     * @param imageUrl
+     * @param imageUrl 多个图片都好分割
      * @param userId
      * @param type 服务：service, 公告：announcement , 活动：activity  租赁 ： transaction
      * @throws IOException
      */
     private void insertTdImage(TpTransaction tpTransaction, String imageUrl, Integer userId,String type) throws IOException {
-        TdImages tdImages = new TdImages();
-        Integer uuId = tpTransaction.getId();
-        tdImages.setImageUrl(imageUrl);
-        tdImages.setType(type);
-        tdImages.setUuid(uuId);
-        tdImages.setCreateUser(userId);
-        tdImages.setCreateTime(new Date());
-        tdImagesMapper.insertSelective(tdImages);
+        String [] imgArr = imageUrl.split(",");
+        for (String url  : imgArr) {
+            TdImages tdImages = new TdImages();
+            Integer uuId = tpTransaction.getId();
+            tdImages.setImageUrl(url);
+            tdImages.setType(type);
+            tdImages.setUuid(uuId);
+            tdImages.setCreateUser(userId);
+            tdImages.setCreateTime(new Date());
+            tdImagesMapper.insertSelective(tdImages);
+        }
     }
     @Override
     public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize,Integer type) {

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -58,8 +58,8 @@ public class TicketServiceImpl implements ITicketService {
         parameter.put("communityId", tpTicket.getCommunityId());
         parameter.put("taUserId", tpTicket.getTaUserId());
 
-        //  0 代表 报修  1 代表 投诉  2代表 联系单
-        parameter.put("type", 0);
+        //  1：投诉   2：报修 3：联系物业
+        parameter.put("type", 2);
         // 报修
         Page<TpTicket> pageRepairs = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketRepairsList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
@@ -67,7 +67,7 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketVOConvert(tpTicketRepairsList, repairsList);
 
         // 投诉
-        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 1);
         Page<TpTicket> pageComplaint = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketComplaintList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
@@ -75,8 +75,8 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketVOConvert(tpTicketComplaintList, complaintList);
 
         // 联系工单
-        //  0 代表 报修  1 代表 投诉  2代表 联系单
-        parameter.put("type", 2);
+        //  1：投诉   2：报修 3：联系物业
+        parameter.put("type", 3);
         Page<TpTicket> pageLiaison = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketLiaisonList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> liaisonList = Lists.newArrayList();
@@ -154,7 +154,7 @@ public class TicketServiceImpl implements ITicketService {
         parameter.put("communityId", tpTicket.getCommunityId());
         parameter.put("taUserId", tpTicket.getTaUserId());
 
-        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        //  1：投诉   2：报修 3：联系物业
         parameter.put("type", tpTicket.getType());
 
        Page<TpTicket> pagelist=PageHelper.startPage(pageNum, pageSize);
@@ -238,8 +238,8 @@ public class TicketServiceImpl implements ITicketService {
         TpTicket tpTicketReco = tpTicketMapper.selectByPrimaryKey(id);
         tpTicketRecord.setCommunityId(user.getCommunityId());
         tpTicketRecord.setTicketId(tpTicketReco.getId());
-        // 0 代表 报修  1 代表 投诉  2代表 联系单
-        String typeName = "0".equals(tpTicket.getType())?"报修":"1".equals(tpTicket.getType())?"投诉":"2".equals(tpTicket.getType())?"联系工单":"";
+        // 1：投诉   2：报修 3：联系物业
+        String typeName = "2".equals(tpTicket.getType())?"报修":"1".equals(tpTicket.getType())?"投诉":"3".equals(tpTicket.getType())?"联系工单":"未知类型";
         tpTicketRecord.setContent("您的"+ typeName +"正在分配物业处理人员, 若长时间无人处理, 请联系物业!");
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
         tpTicketRecord.setCreateUser(userId);
@@ -295,10 +295,8 @@ public class TicketServiceImpl implements ITicketService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type,Integer userId) {
-        // 获取图片
-        List<TdImages> tdImagesList = tpTicket.getTdImagesList();
-        tdImagesList.stream().forEach(e->e.setCreateUser(userId));
+    public ResponseBean updateTicketContent(Integer ticketId, TpTicket tpTicket,Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
 
         // 删除旧图片链接
         Map<String,Object> map = Maps.newHashMap();
@@ -306,12 +304,21 @@ public class TicketServiceImpl implements ITicketService {
         map.put("type","service");
         tdImagesMapper.deleteByUuidAndType(map);
 
-        // 插入图片链接
-        tdImagesMapper.insertBatch(tdImagesList);
+        // 获取图片
+        List<TdImages> tdImagesList = tpTicket.getTdImagesList();
+        if (null != tdImagesList && tdImagesList.size() > 0) {
+            tdImagesList.stream().forEach(e->e.setCreateUser(userId));
+            // 插入图片链接
+            tdImagesMapper.insertBatch(tdImagesList);
+        }
 
-        tpTicket.setId(ticketId);
-        tpTicket.setType(type);
-        tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+        TpTicket ticket = tpTicketMapper.selectByPrimaryKey(ticketId);
+        ticket.setTicketTitle(tpTicket.getTicketTitle());
+        ticket.setTicketContent(tpTicket.getTicketContent());
+
+        tpTicketMapper.updateByPrimaryKeySelective(ticket);
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
     }
 
     @Transactional

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -204,6 +204,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     <if test="transactionTitle != null and transactionTitle !=''">
       and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
     </if>
+    order by create_date DESC
   </select>
 
   <select id="selectTransaction" resultMap="BaseResultMap">
@@ -215,7 +216,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     <if test="type != null and type != ''">
       and type = #{type,jdbcType=INTEGER}
     </if>
-
+    order by create_date DESC
   </select>
 
   <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >

文档/MYSQL/smartCommunity.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542770145" Name="smartCommunity" Objects="655" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542791427" Name="smartCommunity" Objects="656" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5945,9 +5945,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o159">
 <a:CreationDate>1542706044</a:CreationDate>
-<a:ModificationDate>1542706044</a:ModificationDate>
+<a:ModificationDate>1542791427</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-21601,-60687), (-4813,-54689))</a:Rect>
+<a:Rect>((-22201,-62967), (-5413,-56969))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -9335,9 +9335,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>type</a:Code>
 <a:CreationDate>1539162638</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539591244</a:ModificationDate>
+<a:ModificationDate>1542791171</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>类型    0 代表 报修  1 代表 投诉  2代表 联系单   字典</a:Comment>
+<a:Comment>类型    2 代表 报修  1 代表 投诉  3代表 联系单   字典</a:Comment>
 <a:DataType>char(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542770145" Name="smartCommunity" Objects="655" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542791427" Name="smartCommunity" Objects="656" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5945,9 +5945,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o159">
 <a:CreationDate>1542706044</a:CreationDate>
-<a:ModificationDate>1542706044</a:ModificationDate>
+<a:ModificationDate>1542791427</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-21601,-60687), (-4813,-54689))</a:Rect>
+<a:Rect>((-22201,-62967), (-5413,-56969))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -9335,9 +9335,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>type</a:Code>
 <a:CreationDate>1539162638</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539591244</a:ModificationDate>
+<a:ModificationDate>1542791171</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>类型    0 代表 报修  1 代表 投诉  2代表 联系单   字典</a:Comment>
+<a:Comment>类型    2 代表 报修  1 代表 投诉  3代表 联系单   字典</a:Comment>
 <a:DataType>char(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>